Merge remote-tracking branch 'upstream/develop' into develop

* upstream/develop: (211 commits)
  Fix merge error caught by tests
  Add boto3 to utils call
  Pylint fix
  Ensure tht pillar have freshest grains (saltstack#33910)
  Support additional eselect parameters. (saltstack#33876)
  Ensure tht pillar have freshest grains
  Add note about Xenial packages to 2016.3.0 release notes (saltstack#33870)
  add 2016.3.1 release notes (saltstack#33883)
  Fixup new groupadd tests for syntax change in 2016.3
  Use errno
  Set master and cloud to log level warning (saltstack#33861)
  Correct silly mistake
  Allow socket closes when the socket is disconnected
  Add support for edge case when Cmd and Entrypoint can't be blanked
  Remove matcher tests
  Fix another unit test stacktrace in pkg_resource
  Fixing more stupid unit tests
  Fix some more lint
  Fix/add unit tests for state
  Fix broken locate.locate function
  ...

conf/minion

@@ -386,6 +386,10 @@
 #include:
 #  - /etc/salt/extra_config
 #  - /etc/roles/webserver
+
+# The syndic minion can verify that it is talking to the correct master via the
+# key fingerprint of the higher-level master with the "syndic_finger" config.
+#syndic_finger: ''
 #
 #
 #

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

@@ -74,7 +74,7 @@ $( document ).ready(function() {
         var $target = $(target);
 
         $('html, body').stop().animate({
-            'scrollTop': $target.offset().top
+            'scrollTop': $target.offset().top + 200
         }, 900, 'swing', function () {
             window.location.hash = target;
         });
@@ -89,7 +89,7 @@ $( document ).ready(function() {
         var $target = $('dt[id="' + target + '"]');
 
         $('html, body').stop().animate({
-            'scrollTop': $target.offset().top
+            'scrollTop': $target.offset().top + 200
         }, 900, 'swing', function () {
             window.location.hash = target;
         });
@@ -207,3 +207,70 @@ function getMetaStatus() {
       }
    }
 }
+
+(function(document, history, location) {
+    var HISTORY_SUPPORT = !!(history && history.pushState);
+
+    var anchorScrolls = {
+        ANCHOR_REGEX: /^#[^ ]+$/,
+        OFFSET_HEIGHT_PX: 60,
+
+        /**
+         * Establish events, and fix initial scroll position if a hash is provided.
+         */
+        init: function() {
+            this.scrollIfAnchor(location.hash);
+            $('body').on('click', 'a', $.proxy(this, 'delegateAnchors'));
+        },
+
+        /**
+         * Return the offset amount to deduct from the normal scroll position.
+         * Modify as appropriate to allow for dynamic calculations
+         */
+        getFixedOffset: function() {
+            return this.OFFSET_HEIGHT_PX;
+        },
+
+        /**
+         * If the provided href is an anchor which resolves to an element on the
+         * page, scroll to it.
+         * @param  {String} href
+         * @return {Boolean} - Was the href an anchor.
+         */
+        scrollIfAnchor: function(href, pushToHistory) {
+            var match, anchorOffset;
+
+            if(!this.ANCHOR_REGEX.test(href)) {
+                return false;
+            }
+
+            match = document.getElementById(href.slice(1));
+
+            if(match) {
+                anchorOffset = $(match).offset().top - this.getFixedOffset();
+                $('html, body').animate({ scrollTop: anchorOffset});
+
+                // Add the state to history as-per normal anchor links
+                if(HISTORY_SUPPORT && pushToHistory) {
+                    history.pushState({}, document.title, location.pathname + href);
+                }
+            }
+
+            return !!match;
+        },
+
+        /**
+         * If the click event's target was an anchor, fix the scroll position.
+         */
+        delegateAnchors: function(e) {
+            var elem = e.target;
+
+            if(this.scrollIfAnchor(elem.getAttribute('href'), true)) {
+                e.preventDefault();
+            }
+        }
+    };
+
+    $(document).ready($.proxy(anchorScrolls, 'init'));
+})(window.document, window.history, window.location);
+

doc/apidoc-saltmods.sh

@@ -18,6 +18,7 @@ returners
 roster
 runners
 sdb
+thorium
 serializers
 states
 tops

doc/conf.py

@@ -279,11 +279,11 @@ def inner(fn, *iargs, **ikwargs):
 .. _`salt-packagers`: https://groups.google.com/forum/#!forum/salt-packagers
 .. |windownload| raw:: html
 
-     <p>x86: <a href="https://repo.saltstack.com/windows/Salt-Minion-{release}-2-x86-Setup.exe"><strong>Salt-Minion-{release}-2-x86-Setup.exe</strong></a>
-      | <a href="https://repo.saltstack.com/windows/Salt-Minion-{release}-2-x86-Setup.exe.md5"><strong>md5</strong></a></p>
+     <p>x86: <a href="https://repo.saltstack.com/windows/Salt-Minion-{release}-x86-Setup.exe"><strong>Salt-Minion-{release}-x86-Setup.exe</strong></a>
+      | <a href="https://repo.saltstack.com/windows/Salt-Minion-{release}-x86-Setup.exe.md5"><strong>md5</strong></a></p>
 
-     <p>AMD64: <a href="https://repo.saltstack.com/windows/Salt-Minion-{release}-2-AMD64-Setup.exe"><strong>Salt-Minion-{release}-2-AMD64-Setup.exe</strong></a>
-      | <a href="https://repo.saltstack.com/windows/Salt-Minion-{release}-2-AMD64-Setup.exe.md5"><strong>md5</strong></a></p>
+     <p>AMD64: <a href="https://repo.saltstack.com/windows/Salt-Minion-{release}-AMD64-Setup.exe"><strong>Salt-Minion-{release}-AMD64-Setup.exe</strong></a>
+      | <a href="https://repo.saltstack.com/windows/Salt-Minion-{release}-AMD64-Setup.exe.md5"><strong>md5</strong></a></p>
 
 """.format(release=release)
 

doc/contents.rst

@@ -5,7 +5,6 @@ Salt Table of Contents
 .. toctree::
     :maxdepth: 2
 
-    index
     topics/installation/index
     topics/configuration/index
     topics/using_salt