Commit eb6c88b
committed
Merge source/main into implement-kopia branch
1 parent e66a7fd commit eb6c88b
File tree
16 files changed
+38
-36
lines changed- api/v1alpha1
- bundle/manifests
- config/crd/bases
- docs/usage/rsync
- hack
- helm/volsync
- templates
16 files changed
+38
-36
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| |||
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
58 | | - | |
| 58 | + | |
59 | 59 | | |
60 | 60 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
| 13 | + | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
| 16 | + | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
| 19 | + | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| 8 | + | |
8 | 9 | | |
9 | 10 | | |
10 | 11 | | |
| |||
13 | 14 | | |
14 | 15 | | |
15 | 16 | | |
| 17 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
125 | 125 | | |
126 | 126 | | |
127 | 127 | | |
128 | | - | |
| 128 | + | |
129 | 129 | | |
130 | 130 | | |
131 | 131 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
111 | 111 | | |
112 | 112 | | |
113 | 113 | | |
114 | | - | |
| 114 | + | |
115 | 115 | | |
116 | 116 | | |
117 | 117 | | |
| |||
Lines changed: 1 addition & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4351 | 4351 | | |
4352 | 4352 | | |
4353 | 4353 | | |
4354 | | - | |
4355 | | - | |
| 4354 | + | |
4356 | 4355 | | |
4357 | 4356 | | |
4358 | 4357 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4320 | 4320 | | |
4321 | 4321 | | |
4322 | 4322 | | |
4323 | | - | |
4324 | | - | |
| 4323 | + | |
4325 | 4324 | | |
4326 | 4325 | | |
4327 | 4326 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
58 | | - | |
| 58 | + | |
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
| |||
162 | 162 | | |
163 | 163 | | |
164 | 164 | | |
165 | | - | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
166 | 169 | | |
| 170 | + | |
| 171 | + | |
167 | 172 | | |
168 | 173 | | |
169 | 174 | | |
| 175 | + | |
170 | 176 | | |
171 | 177 | | |
172 | 178 | | |
173 | 179 | | |
174 | | - | |
175 | | - | |
176 | | - | |
| 180 | + | |
177 | 181 | | |
178 | | - | |
179 | | - | |
180 | 182 | | |
181 | 183 | | |
182 | 184 | | |
183 | | - | |
184 | 185 | | |
185 | 186 | | |
186 | 187 | | |
| |||
285 | 286 | | |
286 | 287 | | |
287 | 288 | | |
| 289 | + | |
288 | 290 | | |
| 291 | + | |
289 | 292 | | |
290 | 293 | | |
291 | 294 | | |
| |||
Lines changed: 1 addition & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4351 | 4351 | | |
4352 | 4352 | | |
4353 | 4353 | | |
4354 | | - | |
4355 | | - | |
| 4354 | + | |
4356 | 4355 | | |
4357 | 4356 | | |
4358 | 4357 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4320 | 4320 | | |
4321 | 4321 | | |
4322 | 4322 | | |
4323 | | - | |
4324 | | - | |
| 4323 | + | |
4325 | 4324 | | |
4326 | 4325 | | |
4327 | 4326 | | |
| |||
0 commit comments