Skip to content

Commit 4028520

Browse files
dwozdwoz
authored
Merge branch 'master' into patch-3
2 parents 43f4eeb + 41d69cf commit 4028520

7,592 files changed

Lines changed: 1217148 additions & 714241 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.

‎.backportrc.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"repoOwner": "saltstack",
3+
"repoName": "salt",
4+
"targetBranchChoices": ["master", "3006.x", "3005.x", "freeze"],
5+
"autoMerge": false,
6+
"autoMergeMethod": "rebase",
7+
"branchLabelMapping": {
8+
"^backport:(.+)$": "$1"
9+
},
10+
"prTitle": "[BACKPORT] {commitMessages}",
11+
"publishStatusCommentOnSuccess": true,
12+
"sourcePRLabels": [
13+
"backport:complete"
14+
]
15+
}

‎.bandit‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[bandit]
2+
exclude: salt/ext/tornado/*,tests/minionswarm.py
3+
skip: B701

‎.ci/docs‎

Lines changed: 0 additions & 87 deletions
This file was deleted.

‎.ci/kitchen-centos6-py2‎

Lines changed: 0 additions & 152 deletions
This file was deleted.

0 commit comments

Comments
 (0)