Merge branch 'develop' into disable_requisites

saltstack · Oct 23, 2018 · 1cca32f · 1cca32f
2 parents 0e8cced + 809c097
commit 1cca32f
Show file tree

Hide file tree

Showing 189 changed files with 184,989 additions and 153,370 deletions.
diff --git a/.ci/docs b/.ci/docs
@@ -48,6 +48,9 @@ pipeline {
                 description: 'The docs job has failed',
                 status: 'FAILURE',
                 context: "jenkins/pr/docs"
+            slackSend channel: "#jenkins-prod-pr", 
+                color: '#FF0000', 
+                message: "FAILED: PR-Job: '${env.JOB_NAME} [${env.BUILD_NUMBER}]' (${env.BUILD_URL})"
         }
     }
 }
diff --git a/.ci/kitchen-centos7-py2 b/.ci/kitchen-centos7-py2
@@ -72,6 +72,9 @@ timeout(time: 8, unit: 'HOURS') {
                                     description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has failed",
                                     status: 'FAILURE',
                                     context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}"
+                                slackSend channel: "#jenkins-prod-pr", 
+                                    color: '#FF0000', 
+                                    message: "FAILED: PR-Job: '${env.JOB_NAME} [${env.BUILD_NUMBER}]' (${env.BUILD_URL})"
                             }
                         }
                     }

diff --git a/.ci/kitchen-centos7-py3 b/.ci/kitchen-centos7-py3
@@ -72,6 +72,9 @@ timeout(time: 6, unit: 'HOURS') {
                                     description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has failed",
                                     status: 'FAILURE',
                                     context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}"
+                                slackSend channel: "#jenkins-prod-pr", 
+                                    color: '#FF0000', 
+                                    message: "FAILED: PR-Job: '${env.JOB_NAME} [${env.BUILD_NUMBER}]' (${env.BUILD_URL})"
                             }
                         }
                     }

diff --git a/.ci/kitchen-ubuntu1604-py2 b/.ci/kitchen-ubuntu1604-py2
@@ -62,7 +62,7 @@ timeout(time: 6, unit: 'HOURS') {
                         } finally {
                             cleanWs notFailBuild: true
                             def currentResult = currentBuild.result ?: 'SUCCESS'
-                            if ( currentResult == 'SUCCESS') {
+                            if (currentResult == 'SUCCESS') {
                                 githubNotify credentialsId: 'test-jenkins-credentials',
                                     description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed",
                                     status: 'SUCCESS',
@@ -72,6 +72,9 @@ timeout(time: 6, unit: 'HOURS') {
                                     description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has failed",
                                     status: 'FAILURE',
                                     context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}"
+                                slackSend channel: "#jenkins-prod-pr", 
+                                    color: '#FF0000', 
+                                    message: "FAILED: PR-Job: '${env.JOB_NAME} [${env.BUILD_NUMBER}]' (${env.BUILD_URL})"
                             }
                         }
                     }

diff --git a/.ci/kitchen-ubuntu1604-py3 b/.ci/kitchen-ubuntu1604-py3
@@ -72,6 +72,9 @@ timeout(time: 6, unit: 'HOURS') {
                                     description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has failed",
                                     status: 'FAILURE',
                                     context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}"
+                                slackSend channel: "#jenkins-prod-pr", 
+                                    color: '#FF0000', 
+                                    message: "FAILED: PR-Job: '${env.JOB_NAME} [${env.BUILD_NUMBER}]' (${env.BUILD_URL})"
                             }
                         }
                     }

diff --git a/.ci/kitchen-windows2016-py2 b/.ci/kitchen-windows2016-py2
@@ -72,6 +72,9 @@ timeout(time: 6, unit: 'HOURS') {
                                     description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has failed",
                                     status: 'FAILURE',
                                     context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}"
+                                slackSend channel: "#jenkins-prod-pr", 
+                                    color: '#FF0000', 
+                                    message: "FAILED: PR-Job: '${env.JOB_NAME} [${env.BUILD_NUMBER}]' (${env.BUILD_URL})"
                             }
                         }
                     }

diff --git a/.ci/kitchen-windows2016-py3 b/.ci/kitchen-windows2016-py3
@@ -72,6 +72,9 @@ timeout(time: 6, unit: 'HOURS') {
                                     description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has failed",
                                     status: 'FAILURE',
                                     context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}"
+                                slackSend channel: "#jenkins-prod-pr", 
+                                    color: '#FF0000', 
+                                    message: "FAILED: PR-Job: '${env.JOB_NAME} [${env.BUILD_NUMBER}]' (${env.BUILD_URL})"
                             }
                         }
                     }

diff --git a/.ci/lint b/.ci/lint
@@ -94,6 +94,9 @@ pipeline {
                 description: 'The lint job has failed',
                 status: 'FAILURE',
                 context: "jenkins/pr/lint"
+            slackSend channel: "#jenkins-prod-pr", 
+                color: '#FF0000', 
+                message: "FAILED: PR-Job: '${env.JOB_NAME} [${env.BUILD_NUMBER}]' (${env.BUILD_URL})"
         }
     }
 }
diff --git a/.github/stale.yml b/.github/stale.yml
@@ -1,8 +1,8 @@
 # Probot Stale configuration file
 
 # Number of days of inactivity before an issue becomes stale
-# 530 is approximately 1 year and 5 months
-daysUntilStale: 530
+# 520 is approximately 1 year and 5 months
+daysUntilStale: 520
 
 # Number of days of inactivity before a stale issue is closed
 daysUntilClose: 7

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -0,0 +1,13 @@
+Developing Salt
+===============
+
+The Salt development team is welcoming, positive, and dedicated to
+helping people get new code and fixes into SaltStack projects. Log into
+GitHub and get started with one of the largest developer communities in
+the world. The following links should get you started:
+
+`<https://github.com/saltstack>`_
+
+`<https://docs.saltstack.com/en/latest/topics/development/index.html>`_
+
+`<https://docs.saltstack.com/en/develop/topics/development/pull_requests.html>`_
diff --git a/Gemfile b/Gemfile
@@ -12,12 +12,15 @@ group :docker do
 end
 
 group :windows do
-  gem 'vagrant-wrapper'
-  gem 'kitchen-vagrant'
   gem 'winrm', '~>2.0'
-  gem 'winrm-fs', '~>1.2.1'
+  gem 'winrm-fs', :git => 'https://github.com/dwoz/winrm-fs.git', :branch => 'chunked_downloads'
 end
 
 group :ec2 do
   gem 'kitchen-ec2'
 end
+
+group :vagrant do
+  gem 'vagrant-wrapper'
+  gem 'kitchen-vagrant'
+end
diff --git a/NOTICE b/NOTICE
@@ -0,0 +1,5 @@
+Apache SaltStack
+Copyright 2014-2019 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/README.rst b/README.rst
@@ -34,39 +34,6 @@ documentation.
 
 `<https://docs.saltstack.com/en/latest/>`_
 
-Get SaltStack Support and Help
-==============================
-
-**IRC Chat** - Join the vibrant, helpful and positive SaltStack chat room in
-Freenode at #salt. There is no need to introduce yourself, or ask permission to
-join in, just help and be helped! Make sure to wait for an answer, sometimes it
-may take a few moments for someone to reply.
-
-`<http://webchat.freenode.net/?channels=salt&uio=Mj10cnVlJjk9dHJ1ZSYxMD10cnVl83>`_
-
-**SaltStack Slack** - Alongside IRC is our SaltStack Community Slack for the
-SaltStack Working groups. Use the following link to request an invitation.
-
-`<https://saltstackcommunity.herokuapp.com/>`_
-
-**Mailing List** - The SaltStack community users mailing list is hosted by
-Google groups. Anyone can post to ask questions about SaltStack products and
-anyone can help answer. Join the conversation!
-
-`<https://groups.google.com/forum/#!forum/salt-users>`_
-
-You may subscribe to the list without a Google account by emailing
-salt-users+subscribe@googlegroups.com and you may post to the list by emailing
-salt-users@googlegroups.com
-
-**Reporting Issues** - To report an issue with Salt, please follow the
-guidelines for filing bug reports:
-`<https://docs.saltstack.com/en/develop/topics/development/reporting_bugs.html>`_
-
-**SaltStack Support** - If you need dedicated, prioritized support, please
-consider a SaltStack Support package that fits your needs:
-`<http://www.saltstack.com/support>`_
-
 Engage SaltStack
 ================
 
@@ -101,20 +68,6 @@ services`_ offerings.
 .. _SaltStack Certified Engineer (SSCE): http://saltstack.com/certification/
 .. _SaltStack professional services: http://saltstack.com/services/
 
-Developing Salt
-===============
-
-The Salt development team is welcoming, positive, and dedicated to
-helping people get new code and fixes into SaltStack projects. Log into
-GitHub and get started with one of the largest developer communities in
-the world. The following links should get you started:
-
-`<https://github.com/saltstack>`_
-
-`<https://docs.saltstack.com/en/latest/topics/development/index.html>`_
-
-`<https://docs.saltstack.com/en/develop/topics/development/pull_requests.html>`_
-
 License
 =======
 

diff --git a/SUPPORT.rst b/SUPPORT.rst
@@ -0,0 +1,33 @@
+Get SaltStack Support and Help
+==============================
+
+**IRC Chat** - Join the vibrant, helpful and positive SaltStack chat room in
+Freenode at #salt. There is no need to introduce yourself, or ask permission to
+join in, just help and be helped! Make sure to wait for an answer, sometimes it
+may take a few moments for someone to reply.
+
+`<http://webchat.freenode.net/?channels=salt&uio=Mj10cnVlJjk9dHJ1ZSYxMD10cnVl83>`_
+
+**SaltStack Slack** - Alongside IRC is our SaltStack Community Slack for the
+SaltStack Working groups. Use the following link to request an invitation.
+
+`<https://saltstackcommunity.herokuapp.com/>`_
+
+**Mailing List** - The SaltStack community users mailing list is hosted by
+Google groups. Anyone can post to ask questions about SaltStack products and
+anyone can help answer. Join the conversation!
+
+`<https://groups.google.com/forum/#!forum/salt-users>`_
+
+You may subscribe to the list without a Google account by emailing
+salt-users+subscribe@googlegroups.com and you may post to the list by emailing
+salt-users@googlegroups.com
+
+**Reporting Issues** - To report an issue with Salt, please follow the
+guidelines for filing bug reports:
+`<https://docs.saltstack.com/en/develop/topics/development/reporting_bugs.html>`_
+
+**SaltStack Support** - If you need dedicated, prioritized support, please
+consider a SaltStack Support package that fits your needs:
+`<http://www.saltstack.com/support>`_
+
diff --git a/conf/master b/conf/master
@@ -269,24 +269,6 @@
 # The publisher interface ZeroMQPubServerChannel
 #pub_hwm: 1000
 
-# These two ZMQ HWM settings, salt_event_pub_hwm and event_publisher_pub_hwm
-# are significant for masters with thousands of minions.  When these are
-# insufficiently high it will manifest in random responses missing in the CLI
-# and even missing from the job cache.  Masters that have fast CPUs and many
-# cores with appropriate worker_threads will not need these set as high.
-
-# On deployment with 8,000 minions, 2.4GHz CPUs, 24 cores, 32GiB memory has
-# these settings:
-#
-#   salt_event_pub_hwm: 128000
-#   event_publisher_pub_hwm: 64000
-
-# ZMQ high-water-mark for SaltEvent pub socket
-#salt_event_pub_hwm: 20000
-
-# ZMQ high-water-mark for EventPublisher pub socket
-#event_publisher_pub_hwm: 10000
-
 # The master may allocate memory per-event and not
 # reclaim it.
 # To set a high-water mark for memory allocation, use

diff --git a/conf/minion b/conf/minion
@@ -70,6 +70,11 @@
 # Set to zero if the minion should shutdown and not retry.
 # retry_dns: 30
 
+# Set the number of times to attempt to resolve
+# the master hostname if name resolution fails. Defaults to None,
+# which will attempt the resolution indefinitely.
+# retry_dns_count: 3
+
 # Set the port used by the master reply and authentication server.
 #master_port: 4506
 

diff --git a/conf/suse/master b/conf/suse/master
@@ -263,24 +263,6 @@ syndic_user: salt
 # The publisher interface ZeroMQPubServerChannel
 #pub_hwm: 1000
 
-# These two ZMQ HWM settings, salt_event_pub_hwm and event_publisher_pub_hwm
-# are significant for masters with thousands of minions.  When these are
-# insufficiently high it will manifest in random responses missing in the CLI
-# and even missing from the job cache.  Masters that have fast CPUs and many
-# cores with appropriate worker_threads will not need these set as high.
-
-# On deployment with 8,000 minions, 2.4GHz CPUs, 24 cores, 32GiB memory has
-# these settings:
-#
-#   salt_event_pub_hwm: 128000
-#   event_publisher_pub_hwm: 64000
-
-# ZMQ high-water-mark for SaltEvent pub socket
-#salt_event_pub_hwm: 20000
-
-# ZMQ high-water-mark for EventPublisher pub socket
-#event_publisher_pub_hwm: 10000
-
 # The master may allocate memory per-event and not
 # reclaim it.
 # To set a high-water mark for memory allocation, use

diff --git a/doc/contents.rst b/doc/contents.rst
@@ -8,6 +8,7 @@ Salt Table of Contents
     :maxdepth: 2
 
     topics/index
+    topics/community/index
     topics/installation/index
     topics/configuration/index
     topics/using_salt

diff --git a/doc/man/salt-api.1 b/doc/man/salt-api.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-API" "1" "Jun 14, 2018" "2018.3.2" "Salt"
+.TH "SALT-API" "1" "Sep 21, 2018" "2018.3.3" "Salt"
 .SH NAME
 salt-api \- salt-api Command
 .
@@ -103,9 +103,9 @@ Logfile logging log level. One of \fBall\fP, \fBgarbage\fP, \fBtrace\fP,
 .UNINDENT
 .SH SEE ALSO
 .sp
-\fIsalt\-api(7)\fP
-\fIsalt(7)\fP
-\fIsalt\-master(1)\fP
+\fBsalt\-api(7)\fP
+\fBsalt(7)\fP
+\fBsalt\-master(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .\" Generated by docutils manpage writer.

diff --git a/doc/man/salt-call.1 b/doc/man/salt-call.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CALL" "1" "Jun 14, 2018" "2018.3.2" "Salt"
+.TH "SALT-CALL" "1" "Sep 21, 2018" "2018.3.3" "Salt"
 .SH NAME
 salt-call \- salt-call Documentation
 .
@@ -265,9 +265,9 @@ output. Set to True or False. Default: none.
 .UNINDENT
 .SH SEE ALSO
 .sp
-\fIsalt(1)\fP
-\fIsalt\-master(1)\fP
-\fIsalt\-minion(1)\fP
+\fBsalt(1)\fP
+\fBsalt\-master(1)\fP
+\fBsalt\-minion(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .\" Generated by docutils manpage writer.

diff --git a/doc/man/salt-cloud.1 b/doc/man/salt-cloud.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CLOUD" "1" "Jun 14, 2018" "2018.3.2" "Salt"
+.TH "SALT-CLOUD" "1" "Sep 21, 2018" "2018.3.3" "Salt"
 .SH NAME
 salt-cloud \- Salt Cloud Command
 .
@@ -387,10 +387,10 @@ salt\-cloud \-m /path/to/cloud.map \-Q
 .UNINDENT
 .SH SEE ALSO
 .sp
-\fIsalt\-cloud(7)\fP
-\fIsalt(7)\fP
-\fIsalt\-master(1)\fP
-\fIsalt\-minion(1)\fP
+\fBsalt\-cloud(7)\fP
+\fBsalt(7)\fP
+\fBsalt\-master(1)\fP
+\fBsalt\-minion(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .\" Generated by docutils manpage writer.

diff --git a/doc/man/salt-cp.1 b/doc/man/salt-cp.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CP" "1" "Jun 14, 2018" "2018.3.2" "Salt"
+.TH "SALT-CP" "1" "Sep 21, 2018" "2018.3.3" "Salt"
 .SH NAME
 salt-cp \- salt-cp Documentation
 .
@@ -201,9 +201,9 @@ New in version 2016.3.7,2016.11.6,2017.7.0.
 .UNINDENT
 .SH SEE ALSO
 .sp
-\fIsalt(1)\fP
-\fIsalt\-master(1)\fP
-\fIsalt\-minion(1)\fP
+\fBsalt(1)\fP
+\fBsalt\-master(1)\fP
+\fBsalt\-minion(1)\fP
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .\" Generated by docutils manpage writer.