Skip to content

Commit 57925ec

Browse files
hsato03hsato03
committed
Resolve conflicts
2 parents b837624 + 98f5663 commit 57925ec

File tree

2,862 files changed

+182390
-97106
lines changed

Some content is hidden

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

2,862 files changed

+182390
-97106
lines changed

‎.asf.yaml‎

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

5252
collaborators:
5353
- acs-robot
54-
- kiranchavala
5554
- rajujith
56-
- vishesh92
5755
- GaOrtiga
5856
- SadiJr
5957
- winterhazel
60-
- rp-
58+
- gpordeus
59+
- hsato03
60+
- bernardodemarco
61+
- abh1sar
62+
- FelipeM525
6163

6264
protected_branches: ~
6365

‎.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/.flake8‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@
2222
# E224 Tab after operator
2323
# E227 Missing whitespace around bitwise or shift operator
2424
# E242 Tab after ','
25+
# E271 Multiple spaces after keyword
26+
# E272 Multiple spaces before keyword
2527
# E273 Tab after keyword
2628
# E274 Tab before keyword
29+
# E713 Test for membership should be 'not in'
2730
# E742 Do not define classes named 'I', 'O', or 'l'
2831
# E743 Do not define functions named 'I', 'O', or 'l'
2932
# E901 SyntaxError or IndentationError
@@ -37,4 +40,4 @@
3740
exclude =
3841
.git,
3942
venv
40-
select = E112,E113,E133,E223,E224,E227,E242,E273,E274,E742,E743,E901,E902,W291,W292,W293,W391
43+
select = E112,E113,E133,E223,E224,E227,E242,E271,E272,E273,E274,E713,E742,E743,E901,E902,W291,W292,W293,W391

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

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
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+
18+
# MD001/heading-increment Heading levels should only increment by one level at a time
19+
MD001: false
20+
21+
# MD003/heading-style Heading style
22+
MD003: false
23+
24+
# MD004/ul-style Unordered list style
25+
MD004: false
26+
27+
# MD007/ul-indent Unordered list indentation
28+
MD007: false
29+
30+
# MD010/no-hard-tabs Hard tabs
31+
MD010: false
32+
33+
# MD013/line-length Line length
34+
MD013: false
35+
36+
# MD014/commands-show-output Dollar signs used before commands without showing output
37+
MD014: false
38+
39+
# MD022/blanks-around-headings Headings should be surrounded by blank lines
40+
MD022: false
41+
42+
# MD023/heading-start-left Headings must start at the beginning of the line
43+
MD023: false
44+
45+
# MD024/no-duplicate-heading Multiple headings with the same content
46+
MD024: false
47+
48+
# MD025/single-title/single-h1 Multiple top-level headings in the same document
49+
MD025: false
50+
51+
# MD026/no-trailing-punctuation Trailing punctuation in heading
52+
MD026: false
53+
54+
# MD028/no-blanks-blockquote Blank line inside blockquote
55+
MD028: false
56+
57+
# MD029/ol-prefix Ordered list item prefix
58+
MD029: false
59+
60+
# MD031/blanks-around-fences Fenced code blocks should be surrounded by blank lines
61+
MD031: false
62+
63+
# MD032/blanks-around-lists Lists should be surrounded by blank lines
64+
MD032: false
65+
66+
# MD033/no-inline-html Inline HTML
67+
MD033: false
68+
69+
# MD034/no-bare-urls Bare URL used
70+
MD034: false
71+
72+
# MD036/no-emphasis-as-heading Emphasis used instead of a heading
73+
MD036: false
74+
75+
# MD037/no-space-in-emphasis Spaces inside emphasis markers
76+
MD037: false
77+
78+
# MD040/fenced-code-language Fenced code blocks should have a language specified
79+
MD040: false
80+
81+
# MD041/first-line-heading/first-line-h1 First line in a file should be a top-level heading
82+
MD041: false
83+
84+
# MD046/code-block-style Code block style
85+
MD046: false
86+
87+
# MD052/reference-links-images Reference links and images should use a label that is defined
88+
MD052: false

0 commit comments

Comments
 (0)