Commit 1834205
Guard OS type update for iso/template with existing vms (apache#11215)
* Guard OS type update for iso/template with existing vms
* fix identation
* rename vm -> instance
* force update iso/template as true by default via api
* add missing message.success.update.iso label1 parent 15f99d8 commit 1834205
File tree
6 files changed
+53
-3
lines changed- api/src/main/java/org/apache/cloudstack/api
- server/src/main/java/com/cloud/template
- ui
- public/locales
- src/views/image
6 files changed
+53
-3
lines changedLines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
228 | 228 | | |
229 | 229 | | |
230 | 230 | | |
| 231 | + | |
231 | 232 | | |
232 | 233 | | |
233 | 234 | | |
| |||
Lines changed: 8 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
54 | 58 | | |
55 | 59 | | |
56 | 60 | | |
| |||
112 | 116 | | |
113 | 117 | | |
114 | 118 | | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
115 | 123 | | |
116 | 124 | | |
117 | 125 | | |
| |||
Lines changed: 6 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2499 | 2499 | | |
2500 | 2500 | | |
2501 | 2501 | | |
| 2502 | + | |
| 2503 | + | |
| 2504 | + | |
| 2505 | + | |
| 2506 | + | |
| 2507 | + | |
2502 | 2508 | | |
2503 | 2509 | | |
2504 | 2510 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1061 | 1061 | | |
1062 | 1062 | | |
1063 | 1063 | | |
| 1064 | + | |
1064 | 1065 | | |
1065 | 1066 | | |
1066 | 1067 | | |
| |||
3825 | 3826 | | |
3826 | 3827 | | |
3827 | 3828 | | |
| 3829 | + | |
3828 | 3830 | | |
3829 | 3831 | | |
3830 | 3832 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
67 | 67 | | |
68 | 68 | | |
69 | 69 | | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
70 | 77 | | |
71 | 78 | | |
72 | 79 | | |
| |||
172 | 179 | | |
173 | 180 | | |
174 | 181 | | |
175 | | - | |
| 182 | + | |
| 183 | + | |
176 | 184 | | |
177 | 185 | | |
178 | 186 | | |
| |||
195 | 203 | | |
196 | 204 | | |
197 | 205 | | |
198 | | - | |
| 206 | + | |
199 | 207 | | |
200 | 208 | | |
201 | 209 | | |
| |||
207 | 215 | | |
208 | 216 | | |
209 | 217 | | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
210 | 222 | | |
211 | 223 | | |
212 | 224 | | |
213 | 225 | | |
214 | 226 | | |
215 | 227 | | |
216 | 228 | | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
217 | 232 | | |
218 | 233 | | |
219 | 234 | | |
| |||
295 | 310 | | |
296 | 311 | | |
297 | 312 | | |
| 313 | + | |
298 | 314 | | |
299 | 315 | | |
300 | 316 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
103 | 103 | | |
104 | 104 | | |
105 | 105 | | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
106 | 114 | | |
107 | 115 | | |
108 | 116 | | |
| |||
251 | 259 | | |
252 | 260 | | |
253 | 261 | | |
254 | | - | |
| 262 | + | |
| 263 | + | |
255 | 264 | | |
256 | 265 | | |
257 | 266 | | |
| |||
295 | 304 | | |
296 | 305 | | |
297 | 306 | | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
298 | 311 | | |
299 | 312 | | |
300 | 313 | | |
| |||
510 | 523 | | |
511 | 524 | | |
512 | 525 | | |
| 526 | + | |
513 | 527 | | |
514 | 528 | | |
515 | 529 | | |
| |||
546 | 560 | | |
547 | 561 | | |
548 | 562 | | |
| 563 | + | |
| 564 | + | |
| 565 | + | |
549 | 566 | | |
550 | 567 | | |
551 | 568 | | |
| |||
0 commit comments