Merge branch 'develop' of https://github.com/saltstack/salt into upst…

…ream_develop

* 'develop' of https://github.com/saltstack/salt: (2510 commits)
  Added known issue saltstack#30820 to 2015.8.4 release notes
  Updated man pages, version to 2015.8.4, added CVE 2016-1866 to release notes
  Fix some autodoc import warnings from building docs
  Issue saltstack#28706: Fix state user.present behavior.
  Fix for win_network changing dhcp to static DNS
  Fix password is treated as int instead of string in postgres module
  Add new dimension data to doc list
  Make `salt-ssh` executions less of an exception black hole
  Teach python 2.6 how to copy the object.
  Lint fixes
  Lint fixes
  Added ability to install and activate a windows license
  Added the ability to add and remove certificates from Windows minions
  Updated based on PR feedback
  extra space before disabling import warning
  Documentation for the driver
  Fixed all remaining pylint issues
  Set encoding and removed unused libs
  additional fixes to linting
  Indentation causes recognition of no-fetch deployment
  ...

.pylintrc

@@ -163,7 +163,8 @@ additional-builtins=__opts__,
   __jid_event__,
   __instance_id__,
   __salt_system_encoding__,
-  __proxy__
+  __proxy__,
+  __serializers__
 
 # 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

@@ -226,7 +226,8 @@ additional-builtins=__opts__,
   __jid_event__,
   __instance_id__,
   __salt_system_encoding__,
-  __proxy__
+  __proxy__,
+  __serializers__
 
 
 # List of strings which can identify a callback function by name. A callback

AUTHORS

@@ -26,6 +26,7 @@ Aaron Toponce <aaron.toponce@gmail.com>
 Aditya Kulkarni <adi@saltstack.com>
 Alexander Pyatkin <asp@thexyz.net>
 Andre Sachs <andre@sachs.nom.za>
+Andrew Colin Kissa <andrew@topdog.za.net>
 Andrew Kuhnhausen <trane@errstr.com>
 Antti Kaihola <akaihol+github@ambitone.com>
 archme <archme.mail@gmail.com>
@@ -99,6 +100,7 @@ Sean Channel <pentabular@gmail.com>
 Seth House <seth@eseth.com>
 Seth Vidal <skvidal@fedoraproject.org>
 Stas Alekseev <stas.alekseev@gmail.com>
+Thibault Cohen <titilambert@gmail.com>
 Thomas Schreiber <tom@rizumu.us>
 Thomas S Hatch <thatch45@gmail.com>
 Tor Hveem <xt@bash.no>

LICENSE

@@ -1,6 +1,6 @@
    Salt - Remote execution system
 
-   Copyright 2014-2015 SaltStack Team
+   Copyright 2014-2016 SaltStack Team
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

conf/master

@@ -618,6 +618,9 @@
 # on the "renderer" setting and is the default value.
 #pillar_source_merging_strategy: smart
 
+# Recursively merge lists by aggregating them instead of replacing them.
+#pillar_merge_lists: False
+
 
 #####          Syndic settings       #####
 ##########################################

conf/minion

@@ -15,13 +15,23 @@
 # resolved, then the minion will fail to start.
 #master: salt
 
+# Set http proxy information for the minion when doing requests
+#proxy_host:
+#proxy_port:
+#proxy_username:
+#proxy_password:
+
 # If multiple masters are specified in the 'master' setting, the default behavior
 # is to always try to connect to them in the order they are listed. If random_master is
 # set to True, the order will be randomized instead. This can be helpful in distributing
 # the load of many minions executing salt-call requests, for example, from a cron job.
 # If only one master is listed, this setting is ignored and a warning will be logged.
+# NOTE: If master_type is set to failover, use master_shuffle instead.
 #random_master: False
 
+# Use if master_type is set to failover.
+#master_shuffle: False
+
 # Minions can connect to multiple masters simultaneously (all masters
 # are "hot"), or can be configured to failover if a master becomes
 # unavailable.  Multiple hot masters are configured by setting this
@@ -31,7 +41,9 @@
 # master_type: str
 
 # Poll interval in seconds for checking if the master is still there.  Only
-# respected if master_type above is "failover".
+# respected if master_type above is "failover". To disable the interval entirely,
+# set the value to -1. (This may be necessary on machines which have high numbers
+# of TCP connections, such as load balancers.)
 # master_alive_interval: 30
 
 # Set whether the minion should connect to the master via IPv6:
@@ -242,6 +254,12 @@
 # often lower this value
 #loop_interval: 60
 
+# The grains can be merged, instead of overridden, using this option.
+# This allows custom grains to defined different subvalues of a dictionary
+# grain. By default this feature is disabled, to enable set grains_deep_merge
+# to ``True``.
+#grains_deep_merge: False
+
 # The grains_refresh_every setting allows for a minion to periodically check
 # its grains to see if they have changed and, if so, to inform the master
 # of the new grains. This operation is moderately expensive, therefore
@@ -257,6 +275,11 @@
 # Cache grains on the minion. Default is False.
 #grains_cache: False
 
+# Cache rendered pillar data on the minion. Default is False.
+# This may cause 'cachedir'/pillar to contain sensitive data that should be
+# protected accordingly.
+#minion_pillar_cache: False
+
 # Grains cache expiration, in seconds. If the cache file is older than this
 # number of seconds then the grains cache will be dumped and fully re-populated
 # with fresh data. Defaults to 5 minutes. Will have no effect if 'grains_cache'
@@ -559,7 +582,7 @@
 #log_granular_levels: {}
 
 # To diagnose issues with minions disconnecting or missing returns, ZeroMQ
-# supports the use of monitor sockets # to log connection events. This
+# supports the use of monitor sockets to log connection events. This
 # feature requires ZeroMQ 4.0 or higher.
 #
 # To enable ZeroMQ monitor sockets, set 'zmq_monitor' to 'True' and log at a
@@ -571,7 +594,7 @@
 # 'value': 27, 'description': 'EVENT_DISCONNECTED'}
 #
 # All events logged will include the string 'ZeroMQ event'. A connection event
-# should be logged on the as the minion starts up and initially connects to the
+# should be logged as the minion starts up and initially connects to the
 # master. If not, check for debug log level and that the necessary version of
 # ZeroMQ is installed.
 #

doc/_themes/saltstack2/layout.html

@@ -212,7 +212,7 @@
 
                             <div class="col-sm-6">
 
-                                 <a href="http://saltstack.com/events/" target="_blank"><img class="nolightbox footer-banner center" src="{{ pathto('_static/images/webinars-banner.png', 1) }}"/></a>
+                                 <a href="http://saltstack.com/support" target="_blank"><img class="nolightbox footer-banner center" src="{{ pathto('_static/images/footer-support.png', 1) }}"/></a>
 
 
                             </div>
@@ -231,7 +231,11 @@
 
                 {% if on_saltstack %}
 
-                <a href="http://saltconf.com" target="_blank"><img class="nolightbox sidebar-banner center" src="{{ pathto('_static/images/sc16-banner.png', 1) }}"/></a>
+                {% if [True, False]|random %}
+                <a href="http://saltconf.com/register" target="_blank"><img class="nolightbox sidebar-banner center" src="{{ pathto('_static/images/banner-saltconf.png', 1) }}"/></a>
+                {% else %}
+                <a href="http://saltstack.com/support" target="_blank"><img class="nolightbox sidebar-banner center" src="{{ pathto('_static/images/banner-support.png', 1) }}"/></a>
+                {% endif %}
 
                 <div class="releaselinks versions {{ build_type }}">
 

doc/_themes/saltstack2/static/css/webhelp.min_v1.4.4.css

@@ -95,7 +95,7 @@ button#prev-button{float:left;margin:15px 0 0}
 @media(max-width:768px) {
     #sidebar-wrapper{border:1px solid #424242}
 }
-@media(max-height:750px) {
+@media(max-height:450px) {
     .sidebar-banner{display: none !important}
 }
 #header-nav{float:right;text-align:right}
@@ -105,19 +105,23 @@ button#prev-button{float:left;margin:15px 0 0}
 #sidebar-nav .collapsed > ul{display:none}
 #sidebar-nav .glyphicon{padding-left:5px;font-size:14px}
 .nav>li>a:hover,.nav>li>a:focus{background-color:transparent}
-#sidebar-nav li a{display:block;text-decoration:none;color:#424242;border-top:1px solid #e3e3e3;font-size:12px}
-#sidebar-nav ul li:not(.tocify-item){padding-left:10px}
+#sidebar-nav li a{display:block;text-decoration:none;color:#424242;border-top:1px solid #e3e3e3}
+#sidebar-nav li.toctree-l1 > a{font-size:16px}
+#sidebar-nav li.toctree-l2 > a{font-size:14px;font-weight:bold}
+#sidebar-nav ul li:not(.tocify-item){padding-left:15px}
 #sidebar-nav ul a{padding-top:5px;padding-bottom:5px}
 #sidebar-nav > ul > .current{min-height:20px;padding:5px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}
+li.toctree-l2.current{min-height:20px;padding:5px;/*background-color:#f5f5f5;*/background-color:#fff;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}
+li.toctree-l3.current{min-height:20px;padding:5px;background-color:#f5f5f5;border:1px solid #999;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}
 #sidebar-nav > ul > .current a{border:none}
 #sidebar-nav .tocify li.current > a{font-weight:400;background:#48b4fb}
 #sidebar-nav .tocify ul{list-style:circle}
 #sidebar-nav .tocify li a{font-weight:400;font-size:14px;background-color:#34495E;padding-left:4px}
 .tocify li a{display:block;text-decoration:none;color:#fff;border-bottom:none;font-size:14px;font-weight:300}
 #tocify-header0 > li a{border-bottom:1px solid #2C3E50}
 ul.tocify-subheader ul li{margin-left:20px}
-#gen-links > li.current > .tocify > ul > li > a{font-weight:400;font-size:20px;background:transparent;border-bottom:none;border-top:none;color:#333}
-#sidebar-nav li.current:not(.tocify-item) > a{font-weight:400;font-size:20px;border-bottom:none;border-top:none}
+#gen-links > li.current > .tocify > ul > li > a{font-weight:400;font-size:16px;background:transparent;border-bottom:none;border-top:none;color:#333}
+#sidebar-nav li.current:not(.tocify-item) > a{font-weight:400;font-size:16px;border-bottom:none;border-top:none;}
 #gen-links{border-bottom:1px solid #e3e3e3}
 #guide-links a{border-top:none;font-size:20px;color:#333}
 #guide-links a:hover,a:focus{text-decoration:none}
@@ -356,7 +360,9 @@ span.eqno{float:right}
 div.document,div.documentwrapper,div.bodywrapper{margin:0!important;width:100%}
 div.sphinxsidebar,div.related,div.footer,#top-link{display:none}
 }
-
+span.label.label-status{font-size:90%;cursor:help}
+span.badges{font-size:90%;float:right;margin-top:-70px;cursor:help}
+span.label.label-important{background-color: #b94a48}
 /*main*/
 
 h1:hover > .headerlink,h2:hover > .headerlink,h3:hover > .headerlink,h4:hover > .headerlink,h5:hover > .headerlink,h6:hover > .headerlink,dt:hover > .headerlink{visibility:visible}

doc/_themes/saltstack2/static/js/webhelp.min_v1.4.3.js

@@ -158,6 +158,8 @@ $( document ).ready(function() {
     $(document).on('click', '.bootbox', function (event) {
         box.modal('hide');
     });
+
+    getMetaStatus();
 }); // $.document.ready
 
 //refresh on window resize
@@ -189,3 +191,18 @@ function resizeend() {
 function last(list) {
     return list[list.length - 1];
 }
+
+var reviewTag = '<p><strong>Status:&nbsp;&nbsp;</strong><span class="label label-warning label-status" data-container="body" data-delay=\'{ "show": 100, "hide": 100 }\' data-toggle="tooltip" data-placement="right" title="This topic is being reviewed for technical accuracy">Technical Review</span></p>';
+var draftTag = '<p><strong>Status:&nbsp;&nbsp;</strong><span class="label label-important label-status" data-container="body" data-delay=\'{ "show": 100, "hide": 100 }\' data-toggle="tooltip" data-placement="right" title="This topic is a work in progress and might describe functionality that is not yet implemented. Use with caution.">Draft Content</span></p>';
+
+function getMetaStatus() {
+   var metas = document.getElementsByTagName('meta');
+
+   for (i=0; i<metas.length; i++) {
+      if (metas[i].getAttribute("name") == "status") {
+         var statusType = metas[i].getAttribute("content");
+         (statusType == "review") ? tag = reviewTag : tag = draftTag;
+         $( "h1" ).first().after(tag);
+      }
+   }
+}

doc/apidoc-saltmods.sh

@@ -3,10 +3,10 @@
 MOD_DIRS='
 auth
 beacons
-cloud
+clouds
 engines
 executors
-fileserver
+file_server
 modules
 netapi
 output
@@ -27,7 +27,7 @@ build_stubs() {
     [ $# -eq 0 ] && { printf 'Module names are required.' 1>&2; return 1; }
     local outdir
 
-    while [[ -n $1 ]]; do
+    while [ -n $1 ]; do
         outdir="ref/${1}/all"
 
         mkdir -p "$outdir"

doc/conf.py

@@ -88,7 +88,10 @@ def __getattr__(cls, name):
     'tornado.httpserver',
     'tornado.httputil',
     'tornado.ioloop',
+    'tornado.iostream',
+    'tornado.netutil',
     'tornado.simple_httpclient',
+    'tornado.stack_context',
     'tornado.web',
     'tornado.websocket',
 
@@ -161,11 +164,11 @@ def __getattr__(cls, name):
 # -- General Configuration -----------------------------------------------------
 
 project = 'Salt'
-copyright = '2015 SaltStack, Inc.'
+copyright = '2016 SaltStack, Inc.'
 
 version = salt.version.__version__
-latest_release = '2015.8.1'  # latest release
-previous_release = '2015.5.6'  # latest release from previous branch
+latest_release = '2015.8.4'  # latest release
+previous_release = '2015.5.9'  # latest release from previous branch
 previous_release_dir = '2015.5'  # path on web server for previous branch
 build_type = 'develop'  # latest, previous, develop
 
@@ -406,7 +409,7 @@ def __getattr__(cls, name):
 epub_copyright = copyright
 
 epub_scheme = 'URL'
-epub_identifier = 'http://saltstack.org/'
+epub_identifier = 'http://saltstack.com/'
 
 #epub_tocdepth = 3