Merge commit '4bde43503414fc20b14b223433b985944b352479' into develop

* commit '4bde43503414fc20b14b223433b985944b352479': (188 commits)
  Include change on loadavg beacon in release notes
  server/create and server/destroy expect string but receive dict
  Make load beacon cross-platform
  Format entire device force option.
  add versionadded notations
  add zip passwords to archive.extracted
  add password option to unzip
  decorator not needed since zipfile is in std lib
  oops, missed this unused import.
  fixed lint warnings/errors.
  Lint
  setup.py: remove Boron deprecated code
  'comment' fix up's in the returned dictionary.
  Clean up lint error
  fixed few lint warnings.
  Note added to pyenv docs requiring git.
  minor fix up on if conditions.
  added helper function to look up pillar for SupportedLoginProviders and OpenIdConnectProviderARNs if the input into pool_present for these parameters were of string_types.
  Searchdomain to search
  Fix copy/paste issue
  ...

# Conflicts:
#	doc/topics/releases/2015.8.4.rst
#	doc/topics/releases/2015.8.5.rst
#	setup.py

.pylintrc

@@ -164,7 +164,9 @@ additional-builtins=__opts__,
   __instance_id__,
   __salt_system_encoding__,
   __proxy__,
-  __serializers__
+  __serializers__,
+  __reg__,
+  __events__
 
 # List of strings which can identify a callback function by name. A callback
 # name must start or end with one of those strings.

.testing.pylintrc

@@ -227,7 +227,9 @@ additional-builtins=__opts__,
   __instance_id__,
   __salt_system_encoding__,
   __proxy__,
-  __serializers__
+  __serializers__,
+  __reg__,
+  __events__
 
 
 # List of strings which can identify a callback function by name. A callback

conf/cloud.providers.d/vsphere.conf

@@ -5,7 +5,7 @@
 #  url: 'https://10.1.1.1:443'
 
 # Note: Your URL may or may not look like any of the following, depending on how
-# your VMWare installation is configured:
+# your VMware installation is configured:
 #
 #     10.1.1.1
 #     10.1.1.1:443

conf/minion

@@ -326,7 +326,7 @@
 ##########################################
 # Disable specific modules. This allows the admin to limit the level of
 # access the master has to the minion.
-#disable_modules: [cmd,test]
+#disable_modules: [cmdmod,test]
 #disable_returners: []
 #
 # Modules can be loaded from arbitrary paths. This enables the easy deployment

doc/man/salt-api.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-API" "1" "September 01, 2015" "2015.8.0" "Salt"
+.TH "SALT-API" "1" "February 01, 2016" "2015.8.0" "Salt"
 .SH NAME
 salt-api \- salt-api Command
 .
@@ -109,6 +109,6 @@ Logfile logging log level. One of \fBall\fP, \fBgarbage\fP, \fBtrace\fP,
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .SH COPYRIGHT
-2015 SaltStack, Inc.
+2016 SaltStack, Inc.
 .\" Generated by docutils manpage writer.
 .

doc/man/salt-call.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CALL" "1" "September 01, 2015" "2015.8.0" "Salt"
+.TH "SALT-CALL" "1" "February 01, 2016" "2015.8.0" "Salt"
 .SH NAME
 salt-call \- salt-call Documentation
 .
@@ -45,8 +45,8 @@ salt\-call [options]
 .sp
 The salt\-call command is used to run module functions locally on a minion
 instead of executing them from the master. Salt\-call is used to run a
-\fIStandalone Minion\fP, and was originally
-created for \fItroubleshooting\fP\&.
+Standalone Minion, and was originally
+created for troubleshooting\&.
 .sp
 The Salt Master is contacted to retrieve state files and other resources
 during execution unless the \fB\-\-local\fP option is specified.
@@ -253,6 +253,6 @@ changes and success and \fByellow\fP denotes a expected future change in configu
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .SH COPYRIGHT
-2015 SaltStack, Inc.
+2016 SaltStack, Inc.
 .\" Generated by docutils manpage writer.
 .

doc/man/salt-cloud.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CLOUD" "1" "September 01, 2015" "2015.8.0" "Salt"
+.TH "SALT-CLOUD" "1" "February 01, 2016" "2015.8.0" "Salt"
 .SH NAME
 salt-cloud \- Salt Cloud Command
 .
@@ -376,6 +376,6 @@ salt\-cloud \-m /path/to/cloud.map \-Q
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .SH COPYRIGHT
-2015 SaltStack, Inc.
+2016 SaltStack, Inc.
 .\" Generated by docutils manpage writer.
 .

doc/man/salt-cp.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CP" "1" "September 01, 2015" "2015.8.0" "Salt"
+.TH "SALT-CP" "1" "February 01, 2016" "2015.8.0" "Salt"
 .SH NAME
 salt-cp \- salt-cp Documentation
 .
@@ -53,7 +53,7 @@ Salt copy copies a local file out to all of the Salt minions matched by the
 given target.
 .sp
 Note: salt\-cp uses salt\(aqs publishing mechanism. This means the privacy of the
-contents of the file on the wire are completely dependant upon the transport
+contents of the file on the wire is completely dependent upon the transport
 in use. In addition, if the salt\-master is running with debug logging it is
 possible that the contents of the file will be logged to disk.
 .SH OPTIONS
@@ -163,6 +163,6 @@ file.
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .SH COPYRIGHT
-2015 SaltStack, Inc.
+2016 SaltStack, Inc.
 .\" Generated by docutils manpage writer.
 .

doc/man/salt-key.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-KEY" "1" "September 01, 2015" "2015.8.0" "Salt"
+.TH "SALT-KEY" "1" "February 01, 2016" "2015.8.0" "Salt"
 .SH NAME
 salt-key \- salt-key Documentation
 .
@@ -45,6 +45,32 @@ salt\-key [ options ]
 .sp
 Salt\-key executes simple management of Salt server public keys used for
 authentication.
+.sp
+On initial connection, a Salt minion sends its public key to the Salt
+master. This key must be accepted using the \fBsalt\-key\fP command on the
+Salt master.
+.sp
+Salt minion keys can be in one of the following states:
+.INDENT 0.0
+.IP \(bu 2
+\fBunaccepted\fP: key is waiting to be accepted.
+.IP \(bu 2
+\fBaccepted\fP: key was accepted and the minion can communicate with the Salt
+master.
+.IP \(bu 2
+\fBrejected\fP: key was rejected using the \fBsalt\-key\fP command. In
+this state the minion does not receive any communication from the Salt
+master.
+.IP \(bu 2
+\fBdenied\fP: key was rejected automatically by the Salt master.
+This occurs when a minion has a duplicate ID, or when a minion was rebuilt or
+had new keys generated and the previous key was not deleted from the Salt
+master. In this state the minion does not receive any communication from the
+Salt master.
+.UNINDENT
+.sp
+To change the state of a minion key, use \fB\-d\fP to delete the key and then
+accept or reject the key.
 .SH OPTIONS
 .INDENT 0.0
 .TP
@@ -302,6 +328,6 @@ Auto\-create a signing key\-pair if it does not yet exist
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .SH COPYRIGHT
-2015 SaltStack, Inc.
+2016 SaltStack, Inc.
 .\" Generated by docutils manpage writer.
 .

doc/man/salt-master.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-MASTER" "1" "September 01, 2015" "2015.8.0" "Salt"
+.TH "SALT-MASTER" "1" "February 01, 2016" "2015.8.0" "Salt"
 .SH NAME
 salt-master \- salt-master Documentation
 .
@@ -114,6 +114,6 @@ Logfile logging log level. One of \fBall\fP, \fBgarbage\fP, \fBtrace\fP,
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .SH COPYRIGHT
-2015 SaltStack, Inc.
+2016 SaltStack, Inc.
 .\" Generated by docutils manpage writer.
 .

doc/man/salt-minion.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-MINION" "1" "September 01, 2015" "2015.8.0" "Salt"
+.TH "SALT-MINION" "1" "February 01, 2016" "2015.8.0" "Salt"
 .SH NAME
 salt-minion \- salt-minion Documentation
 .
@@ -115,6 +115,6 @@ Logfile logging log level. One of \fBall\fP, \fBgarbage\fP, \fBtrace\fP,
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .SH COPYRIGHT
-2015 SaltStack, Inc.
+2016 SaltStack, Inc.
 .\" Generated by docutils manpage writer.
 .

doc/man/salt-proxy.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-PROXY" "1" "September 01, 2015" "2015.8.0" "Salt"
+.TH "SALT-PROXY" "1" "February 01, 2016" "2015.8.0" "Salt"
 .SH NAME
 salt-proxy \- salt-proxy Documentation
 .
@@ -123,6 +123,6 @@ Logfile logging log level. One of \fBall\fP, \fBgarbage\fP, \fBtrace\fP,
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .SH COPYRIGHT
-2015 SaltStack, Inc.
+2016 SaltStack, Inc.
 .\" Generated by docutils manpage writer.
 .

doc/man/salt-run.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-RUN" "1" "September 01, 2015" "2015.8.0" "Salt"
+.TH "SALT-RUN" "1" "February 01, 2016" "2015.8.0" "Salt"
 .SH NAME
 salt-run \- salt-run Documentation
 .
@@ -120,6 +120,6 @@ Logfile logging log level. One of \fBall\fP, \fBgarbage\fP, \fBtrace\fP,
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .SH COPYRIGHT
-2015 SaltStack, Inc.
+2016 SaltStack, Inc.
 .\" Generated by docutils manpage writer.
 .

doc/man/salt-ssh.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-SSH" "1" "September 01, 2015" "2015.8.0" "Salt"
+.TH "SALT-SSH" "1" "February 01, 2016" "2015.8.0" "Salt"
 .SH NAME
 salt-ssh \- salt-ssh Documentation
 .
@@ -91,8 +91,15 @@ is 25.
 .INDENT 0.0
 .TP
 .B \-i, \-\-ignore\-host\-keys
-Ignore the ssh host keys which by default are honored and connections
-would ask for approval.
+Disables StrictHostKeyChecking to relax acceptance of new and unknown
+host keys.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-no\-host\-keys
+Fully ignores ssh host keys which by default are honored and connections
+would ask for approval. Useful if the host key of a remote server has
+changed and would still error with \-\-ignore\-host\-keys.
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -268,6 +275,6 @@ changes and success and \fByellow\fP denotes a expected future change in configu
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .SH COPYRIGHT
-2015 SaltStack, Inc.
+2016 SaltStack, Inc.
 .\" Generated by docutils manpage writer.
 .

doc/man/salt-syndic.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-SYNDIC" "1" "September 01, 2015" "2015.8.0" "Salt"
+.TH "SALT-SYNDIC" "1" "February 01, 2016" "2015.8.0" "Salt"
 .SH NAME
 salt-syndic \- salt-syndic Documentation
 .
@@ -116,6 +116,6 @@ Logfile logging log level. One of \fBall\fP, \fBgarbage\fP, \fBtrace\fP,
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .SH COPYRIGHT
-2015 SaltStack, Inc.
+2016 SaltStack, Inc.
 .\" Generated by docutils manpage writer.
 .

doc/man/salt-unity.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-UNITY" "1" "September 01, 2015" "2015.8.0" "Salt"
+.TH "SALT-UNITY" "1" "February 01, 2016" "2015.8.0" "Salt"
 .SH NAME
 salt-unity \- salt-unity Command
 .
@@ -64,6 +64,6 @@ invokes that script.
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .SH COPYRIGHT
-2015 SaltStack, Inc.
+2016 SaltStack, Inc.
 .\" Generated by docutils manpage writer.
 .

doc/man/salt.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT" "1" "September 01, 2015" "2015.8.0" "Salt"
+.TH "SALT" "1" "February 01, 2016" "2015.8.0" "Salt"
 .SH NAME
 salt \- salt
 .
@@ -329,6 +329,6 @@ changes and success and \fByellow\fP denotes a expected future change in configu
 .SH AUTHOR
 Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
 .SH COPYRIGHT
-2015 SaltStack, Inc.
+2016 SaltStack, Inc.
 .\" Generated by docutils manpage writer.
 .