Commit 500679a
authored
Merge pull request openshift#961 from openshift-bot/synchronize-upstream
NO-ISSUE: Synchronize From Upstream RepositoriesFile tree
29 files changed
+815
-203
lines changed- staging/operator-lifecycle-manager
- .github
- vendor
- github.com/prometheus/client_golang/prometheus
- internal
- promhttp
- testutil
- promlint/validations
- k8s.io/code-generator
29 files changed
+815
-203
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| |||
158 | 158 | | |
159 | 159 | | |
160 | 160 | | |
161 | | - | |
| 161 | + | |
162 | 162 | | |
163 | 163 | | |
164 | 164 | | |
| |||
209 | 209 | | |
210 | 210 | | |
211 | 211 | | |
212 | | - | |
213 | | - | |
| 212 | + | |
| 213 | + | |
214 | 214 | | |
215 | | - | |
| 215 | + | |
216 | 216 | | |
217 | 217 | | |
218 | 218 | | |
219 | | - | |
| 219 | + | |
220 | 220 | | |
221 | 221 | | |
222 | 222 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1999 | 1999 | | |
2000 | 2000 | | |
2001 | 2001 | | |
2002 | | - | |
2003 | | - | |
| 2002 | + | |
| 2003 | + | |
2004 | 2004 | | |
2005 | 2005 | | |
2006 | 2006 | | |
| |||
3083 | 3083 | | |
3084 | 3084 | | |
3085 | 3085 | | |
3086 | | - | |
3087 | | - | |
3088 | | - | |
3089 | | - | |
| 3086 | + | |
| 3087 | + | |
| 3088 | + | |
| 3089 | + | |
3090 | 3090 | | |
3091 | 3091 | | |
3092 | | - | |
3093 | | - | |
3094 | | - | |
3095 | | - | |
| 3092 | + | |
| 3093 | + | |
| 3094 | + | |
| 3095 | + | |
3096 | 3096 | | |
3097 | 3097 | | |
3098 | 3098 | | |
3099 | | - | |
3100 | | - | |
| 3099 | + | |
| 3100 | + | |
3101 | 3101 | | |
3102 | 3102 | | |
3103 | | - | |
3104 | | - | |
3105 | | - | |
3106 | | - | |
| 3103 | + | |
| 3104 | + | |
| 3105 | + | |
| 3106 | + | |
3107 | 3107 | | |
3108 | 3108 | | |
3109 | 3109 | | |
| |||
3119 | 3119 | | |
3120 | 3120 | | |
3121 | 3121 | | |
3122 | | - | |
3123 | | - | |
| 3122 | + | |
| 3123 | + | |
3124 | 3124 | | |
3125 | 3125 | | |
3126 | 3126 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
| 31 | + | |
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
| |||
178 | 178 | | |
179 | 179 | | |
180 | 180 | | |
181 | | - | |
| 181 | + | |
182 | 182 | | |
183 | 183 | | |
184 | 184 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1850 | 1850 | | |
1851 | 1851 | | |
1852 | 1852 | | |
1853 | | - | |
1854 | | - | |
| 1853 | + | |
| 1854 | + | |
1855 | 1855 | | |
1856 | 1856 | | |
1857 | 1857 | | |
| |||
2839 | 2839 | | |
2840 | 2840 | | |
2841 | 2841 | | |
2842 | | - | |
2843 | | - | |
2844 | | - | |
2845 | | - | |
2846 | | - | |
2847 | | - | |
2848 | | - | |
2849 | | - | |
2850 | | - | |
2851 | | - | |
2852 | | - | |
2853 | | - | |
2854 | | - | |
2855 | | - | |
| 2842 | + | |
| 2843 | + | |
| 2844 | + | |
| 2845 | + | |
| 2846 | + | |
| 2847 | + | |
| 2848 | + | |
| 2849 | + | |
| 2850 | + | |
| 2851 | + | |
| 2852 | + | |
| 2853 | + | |
| 2854 | + | |
| 2855 | + | |
2856 | 2856 | | |
2857 | 2857 | | |
2858 | 2858 | | |
2859 | 2859 | | |
2860 | 2860 | | |
2861 | 2861 | | |
2862 | | - | |
2863 | | - | |
| 2862 | + | |
| 2863 | + | |
2864 | 2864 | | |
2865 | 2865 | | |
2866 | 2866 | | |
| |||
Lines changed: 50 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 9 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments