Skip to content

Commit 1dba0f8

Browse files
jbamptonjbampton
authored
Merge branch 'main' into fix-spelling-grammar-case-whitespace
2 parents 02d59c0 + 41b4f0a commit 1dba0f8

1,541 files changed

Lines changed: 128733 additions & 80483 deletions

File tree

Some content is hidden

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

‎.asf.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ github:
5151

5252
collaborators:
5353
- acs-robot
54-
- rajujith
55-
- GaOrtiga
56-
- SadiJr
57-
- winterhazel
5854
- gpordeus
5955
- hsato03
6056
- bernardodemarco
61-
- abh1sar
6257
- FelipeM525
58+
- lucas-a-martins
59+
- nicoschmdt
60+
- abh1sar
61+
- sudo87
62+
- rosi-shapeblue
6363

6464
protected_branches: ~
6565

‎.github/ISSUE_TEMPLATE/bug.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
description: "Thank you for reporting a bug!"
18+
name: bug
19+
title: "[SHORT PROBLEM DESCRIPTION]"
20+
labels: bug, needs-triageing
21+
body:
22+
- type: markdown
23+
attributes:
24+
value: "## Welcome, please describe your problem below;"
25+
- type: textarea
26+
attributes:
27+
label: problem
28+
value: The long description of your problem
29+
- type: markdown
30+
attributes:
31+
value: "## What versions of cloudstack and any infra components are you using"
32+
- type: textarea
33+
attributes:
34+
label: versions
35+
value: The versions of ACS, hypervisors, storage, network etc..
36+
- type: textarea
37+
attributes:
38+
label: The steps to reproduce the bug
39+
value: |
40+
1.
41+
2.
42+
3.
43+
...
44+
- type: textarea
45+
attributes:
46+
label: "What to do about it?"

‎.github/ISSUE_TEMPLATE/feature_request.yaml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
description: "Thank you for your new feature idea!"
18+
name: feature
19+
title: "[SHORT FUNCTIONAL DESCRIPTION]"
20+
labels: new
21+
body:
22+
- type: textarea
23+
attributes:
24+
label: "The required feature described as a wish"
25+
value: As a User/Admin/Operator I would like to , ... have the system make my morning coffee.

‎.github/linters/.markdown-lint.yml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,15 @@ MD004: false
2727
# MD007/ul-indent Unordered list indentation
2828
MD007: false
2929

30-
# MD009/no-trailing-spaces Trailing spaces
31-
MD009: false
32-
3330
# MD010/no-hard-tabs Hard tabs
3431
MD010: false
3532

36-
# MD012/no-multiple-blanks Multiple consecutive blank lines
37-
MD012: false
38-
3933
# MD013/line-length Line length
4034
MD013: false
4135

4236
# MD014/commands-show-output Dollar signs used before commands without showing output
4337
MD014: false
4438

45-
# MD018/no-missing-space-atx No space after hash on atx style heading
46-
MD018: false
47-
48-
# MD019/no-multiple-space-atx Multiple spaces after hash on atx style heading
49-
MD019: false
50-
5139
# MD022/blanks-around-headings Headings should be surrounded by blank lines
5240
MD022: false
5341

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,8 @@ jobs:
164164
component/test_cpu_limits
165165
component/test_cpu_max_limits
166166
component/test_cpu_project_limits
167-
component/test_deploy_vm_userdata_multi_nic",
167+
component/test_deploy_vm_userdata_multi_nic
168+
component/test_deploy_vm_lease",
168169
"component/test_egress_fw_rules
169170
component/test_invalid_gw_nm
170171
component/test_ip_reservation",
@@ -236,7 +237,7 @@ jobs:
236237
237238
- name: Install Python dependencies
238239
run: |
239-
python3 -m pip install --user --upgrade urllib3 lxml paramiko nose texttable ipmisim pyopenssl pycrypto mock flask netaddr pylint pycodestyle six astroid
240+
python3 -m pip install --user --upgrade urllib3 lxml paramiko nose texttable ipmisim pyopenssl pycryptodome mock flask netaddr pylint pycodestyle six astroid pynose
240241
241242
- name: Install jacoco dependencies
242243
run: |

‎.github/workflows/main-sonar-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
uses: actions/cache@v4
5555
with:
5656
path: ~/.m2/repository
57-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
57+
key: ${{ runner.os }}-m2-${{ hashFiles('pom.xml', '*/pom.xml', '*/*/pom.xml', '*/*/*/pom.xml') }}
5858
restore-keys: |
5959
${{ runner.os }}-m2
6060

‎.github/workflows/sonar-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
uses: actions/cache@v4
5757
with:
5858
path: ~/.m2/repository
59-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
59+
key: ${{ runner.os }}-m2-${{ hashFiles('pom.xml', '*/pom.xml', '*/*/pom.xml', '*/*/*/pom.xml') }}
6060
restore-keys: |
6161
${{ runner.os }}-m2
6262

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# to you under the Apache License, Version 2.0 (the
66
# "License"); you may not use this file except in compliance
77
# with the License. You may obtain a copy of the License at
8-
#
8+
#
99
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
10+
#
1111
# Unless required by applicable law or agreed to in writing,
1212
# software distributed under the License is distributed on an
1313
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

‎.pre-commit-config.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ repos:
5454
^systemvm/agent/certs/realhostip\.key$
5555
- id: end-of-file-fixer
5656
exclude: \.vhd$
57-
#- id: fix-byte-order-marker
57+
- id: fix-byte-order-marker
5858
- id: forbid-submodules
5959
- id: mixed-line-ending
60-
exclude: \.(cs|xml)$
60+
exclude: \.cs$
6161
- id: trailing-whitespace
62-
files: \.(header|in|java|md|properties|py|rb|sh|sql|txt|vue|xml|yaml|yml)$
62+
files: \.(bat|cfg|cs|css|gitignore|header|in|install|java|md|properties|py|rb|sh|sql|txt|vue|xml|xsl|yaml|yml)$
6363
args: [--markdown-linebreak-ext=md]
6464
exclude: ^services/console-proxy/rdpconsole/src/test/doc/freerdp-debug-log\.txt$
6565
- repo: https://github.com/codespell-project/codespell
@@ -87,7 +87,7 @@ repos:
8787
^setup/bindir/cloud-setup-encryption\.in$|
8888
^venv/.*$
8989
- repo: https://github.com/igorshubovych/markdownlint-cli
90-
rev: v0.40.0
90+
rev: v0.43.0
9191
hooks:
9292
- id: markdownlint
9393
name: run markdownlint

‎.python-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.6
1+
3.10

0 commit comments

Comments
 (0)