Skip to content

Commit 672c3d5

Browse files
committed
merge fixup
2 parents 14970a7 + 39126a4 commit 672c3d5

File tree

51 files changed

+234
-224
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+234
-224
lines changed

.github/linters/codespell.txt

Lines changed: 8 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ acount
44
actuall
55
acuiring
66
acumulate
7+
addin
78
addreess
89
addtion
910
adminstrator
@@ -12,10 +13,8 @@ afrer
1213
afterall
1314
againt
1415
ags
15-
aktive
1616
algoritm
1717
allo
18-
alloacate
1918
allocted
2019
alocation
2120
alogrithm
@@ -65,6 +64,7 @@ bject
6564
boardcast
6665
bootstraper
6766
bu
67+
callin
6868
cant
6969
capabilites
7070
capablity
@@ -73,6 +73,7 @@ carrefully
7373
cavaet
7474
chaing
7575
checkd
76+
checkin
7677
childs
7778
choosen
7879
chould
@@ -93,17 +94,14 @@ confg
9394
configruation
9495
configuable
9596
conneciton
96-
connexion
9797
constrait
9898
constraits
9999
containg
100100
contex
101101
continuesly
102102
contro
103103
controler
104-
controles
105104
controll
106-
convienient
107105
convinience
108106
coputer
109107
correcponding
@@ -158,13 +156,13 @@ differnet
158156
differnt
159157
direcotry
160158
directroy
161-
disale
162159
disbale
163160
discrepency
164161
disover
165162
dissapper
166163
dissassociated
167164
divice
165+
dockin
168166
doesn'
169167
doesnot
170168
doesnt
@@ -175,7 +173,6 @@ eanbled
175173
earch
176174
ect
177175
elemnt
178-
eles
179176
elments
180177
emmited
181178
enble
@@ -187,22 +184,19 @@ environmnet
187184
equivalant
188185
erro
189186
erronous
190-
everthing
191187
everytime
192188
excute
193189
execept
194190
execption
191+
exects
195192
execut
196193
executeable
197194
exeeded
198195
exisitng
199196
exisits
200-
existin
201197
existsing
202-
exitting
203198
expcted
204199
expection
205-
explaination
206200
explicitely
207201
faield
208202
faild
@@ -215,7 +209,6 @@ fillled
215209
findout
216210
fisrt
217211
fo
218-
folowing
219212
fowarding
220213
frist
221214
fro
@@ -234,6 +227,7 @@ hanling
234227
happend
235228
hasing
236229
hasnt
230+
havin
237231
hda
238232
hostanme
239233
hould
@@ -253,18 +247,13 @@ implmeneted
253247
implmentation
254248
incase
255249
includeing
256-
incosistency
257250
indecates
258-
indien
259251
infor
260252
informations
261253
informaton
262-
infrastrcuture
263254
ingore
264-
inital
265255
initalize
266256
initator
267-
initilization
268257
inspite
269258
instal
270259
instnace
@@ -283,12 +272,8 @@ ist
283272
klunky
284273
lable
285274
leve
286-
lief
287275
limite
288-
linke
289276
listner
290-
lokal
291-
lokales
292277
maintainence
293278
maintenace
294279
maintenence
@@ -297,7 +282,6 @@ mambers
297282
manaully
298283
manuel
299284
maxium
300-
mehtod
301285
mergable
302286
mesage
303287
messge
@@ -307,7 +291,6 @@ minumum
307291
mis
308292
modifers
309293
mor
310-
mot
311294
mulitply
312295
multipl
313296
multple
@@ -321,7 +304,7 @@ nin
321304
nodel
322305
nome
323306
noone
324-
nowe
307+
notin
325308
numbe
326309
numer
327310
occured
@@ -389,7 +372,6 @@ remaning
389372
remore
390373
remvoing
391374
renabling
392-
repeatly
393375
reponse
394376
reqest
395377
reqiured
@@ -412,14 +394,13 @@ retuned
412394
returing
413395
rever
414396
rocessor
397+
roperty
415398
runing
416399
runnign
417400
sate
418401
scalled
419-
scipt
420402
scirpt
421403
scrip
422-
seconadry
423404
seconday
424405
seesion
425406
sepcified
@@ -432,12 +413,10 @@ settig
432413
sevices
433414
shoul
434415
shoule
435-
sie
436416
signle
437417
simplier
438418
singature
439419
skiping
440-
snaphsot
441420
snpashot
442421
specied
443422
specifed
@@ -448,7 +427,6 @@ standy
448427
statics
449428
stickyness
450429
stil
451-
stip
452430
storeage
453431
strat
454432
streched
@@ -457,7 +435,6 @@ succesfull
457435
successfull
458436
suceessful
459437
suces
460-
sucessfully
461438
suiteable
462439
suppots
463440
suppport
@@ -490,22 +467,19 @@ uncompressible
490467
uneccessarily
491468
unexepected
492469
unexpect
493-
unknow
494470
unkonw
495471
unkown
496472
unneccessary
497473
unparseable
498474
unrecoginized
499475
unsupport
500476
unxpected
501-
updat
502477
uptodate
503478
usera
504479
usign
505480
usin
506481
utlization
507482
vaidate
508-
valiate
509483
valule
510484
valus
511485
varibles
@@ -514,8 +488,6 @@ verfying
514488
verifing
515489
virutal
516490
visable
517-
wakup
518491
wil
519492
wit
520-
wll
521493
wth

.pre-commit-config.yaml

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,35 @@ repos:
6262
- .github/workflows/license-templates/LICENSE.txt
6363
- --fuzzy-match-generates-todo
6464
exclude: ^(CHANGES|ISSUE_TEMPLATE|PULL_REQUEST_TEMPLATE)\.md$|^ui/docs/(full|smoke)-test-plan\.template\.md$
65+
- id: insert-license
66+
name: add license for all Shell files
67+
description: automatically adds a licence header to all Shell files that don't have a license header
68+
files: \.sh$
69+
args:
70+
- --comment-style
71+
- '|#|'
72+
- --license-filepath
73+
- .github/workflows/license-templates/LICENSE.txt
74+
- --fuzzy-match-generates-todo
75+
- id: insert-license
76+
name: add license for all SQL files
77+
files: \.sql$
78+
args:
79+
- --comment-style
80+
- '|--|'
81+
- --license-filepath
82+
- .github/workflows/license-templates/LICENSE.txt
83+
- --fuzzy-match-generates-todo
84+
- id: insert-license
85+
name: add license for all YAML files
86+
description: automatically adds a licence header to all YAML files that don't have a license header
87+
files: \.ya?ml$
88+
args:
89+
- --comment-style
90+
- '|#|'
91+
- --license-filepath
92+
- .github/workflows/license-templates/LICENSE.txt
93+
- --fuzzy-match-generates-todo
6594
- repo: https://github.com/pre-commit/pre-commit-hooks
6695
rev: v6.0.0
6796
hooks:
@@ -107,7 +136,7 @@ repos:
107136
args: [--markdown-linebreak-ext=md]
108137
exclude: ^services/console-proxy/rdpconsole/src/test/doc/freerdp-debug-log\.txt$
109138
- repo: https://github.com/codespell-project/codespell
110-
rev: v2.2.6
139+
rev: v2.4.1
111140
hooks:
112141
- id: codespell
113142
name: run codespell

agent/src/main/java/com/cloud/agent/properties/AgentProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public class AgentProperties{
117117

118118
/**
119119
* Local storage path.<br>
120-
* This property allows multiple values to be entered in a single String. The differente values must be separated by commas.<br>
120+
* This property allows multiple values to be entered in a single String. The different values must be separated by commas.<br>
121121
* Data type: String.<br>
122122
* Default value: <code>/var/lib/libvirt/images/</code>
123123
*/
@@ -134,7 +134,7 @@ public class AgentProperties{
134134

135135
/**
136136
* MANDATORY: The UUID for the local storage pool.<br>
137-
* This property allows multiple values to be entered in a single String. The differente values must be separated by commas.<br>
137+
* This property allows multiple values to be entered in a single String. The different values must be separated by commas.<br>
138138
* Data type: String.<br>
139139
* Default value: <code>null</code>
140140
*/

api/src/main/java/com/cloud/storage/Storage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public static enum FileSystem {
128128
public static enum TemplateType {
129129
ROUTING, // Router template
130130
SYSTEM, /* routing, system vm template */
131-
BUILTIN, /* buildin template */
131+
BUILTIN, /* builtin template */
132132
PERHOST, /* every host has this template, don't need to install it in secondary storage */
133133
USER, /* User supplied template/iso */
134134
VNF, /* VNFs (virtual network functions) template */

engine/components-api/src/main/java/com/cloud/storage/StorageManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ public interface StorageManager extends StorageService {
230230

231231
/**
232232
* should we execute in sequence not involving any storages?
233-
* @return tru if commands should execute in sequence
233+
* @return true if commands should execute in sequence
234234
*/
235235
static boolean shouldExecuteInSequenceOnVmware() {
236236
return shouldExecuteInSequenceOnVmware(null, null);

engine/components-api/src/main/java/com/cloud/vm/snapshot/VMSnapshotManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public interface VMSnapshotManager extends VMSnapshotService, Manager {
4242
boolean deleteAllVMSnapshots(long id, VMSnapshot.Type type);
4343

4444
/**
45-
* Sync VM snapshot state when VM snapshot in reverting or snapshoting or expunging state
45+
* Sync VM snapshot state when VM snapshot in reverting or snapshotting or expunging state
4646
* Used for fullsync after agent connects
4747
*
4848
* @param vm, the VM in question

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41810to41900.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ private void modifyDateColumnNameAndCreateNewOne(Connection conn) {
159159
try (PreparedStatement pstmt = conn.prepareStatement(createNewColumn)) {
160160
pstmt.execute();
161161
} catch (SQLException e) {
162-
String message = String.format("Unable to crate new backups' column date due to [%s].", e.getMessage());
162+
String message = String.format("Unable to create new backups' column date due to [%s].", e.getMessage());
163163
logger.error(message, e);
164164
throw new CloudRuntimeException(message, e);
165165
}

engine/schema/src/main/resources/META-INF/db/schema-307to410.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
-- distributed with this work for additional information
44
-- regarding copyright ownership. The ASF licenses this file
55
-- to you under the Apache License, Version 2.0 (the
6-
-- "License"); you may not use this file except in compliances
6+
-- "License"); you may not use this file except in compliance
77
-- with the License. You may obtain a copy of the License at
88
--
99
-- http://www.apache.org/licenses/LICENSE-2.0

plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/ROOT.virtualization.v2.Msvm_EthernetSwitchPort.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,8 +1267,8 @@ public bool IsVMQOffloadUsageNull {
12671267

12681268
[Browsable(true)]
12691269
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
1270-
[Description("The current VMQ offloading usage on this port. The usage is the amount of VMQ res" +
1271-
"ources in use on the port.")]
1270+
[Description("The current VMQ offloading usage on this port. The usage is the amount of VMQ " +
1271+
"resources in use on the port.")]
12721272
[TypeConverter(typeof(WMIValueTypeConverter))]
12731273
public uint VMQOffloadUsage {
12741274
get {

plugins/hypervisors/hyperv/DotNet/ServerResource/WmiWrappers/ROOT.virtualization.v2.Msvm_ExternalEthernetPort.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -618,10 +618,9 @@ public bool IsIsBoundNull {
618618

619619
[Browsable(true)]
620620
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
621-
[Description("If this property is true, then this Ethernet port can be connected to the switche" +
622-
"s and thus can provide connectivity to virtual machine. If this property is fals" +
623-
"e, then this Ethernet is not being used by the virtual machine networking archit" +
624-
"ecture.")]
621+
[Description("If this property is true, then this Ethernet port can be connected to the switches" +
622+
" and thus can provide connectivity to virtual machine. If this property is false" +
623+
", then this Ethernet is not being used by the virtual machine networking architecture.")]
625624
[TypeConverter(typeof(WMIValueTypeConverter))]
626625
public bool IsBound {
627626
get {

0 commit comments

Comments
 (0)