Merge branch '2016.3' into 'develop'

Conflicts:
  - salt/minion.py

doc/_themes/saltstack2/layout.html

@@ -143,9 +143,9 @@
                     <!-- Collect the nav links, forms, and other content for toggling -->
                     <div class="collapse navbar-collapse" id="navbarCollapse">
                         <ul class="nav navbar-nav">
-                <li><a href="/en/latest/">Documentation</a></li>
+                <li><a href="/en/latest/">Overview</a></li>
                 <li><a href="/en/getstarted/">Tutorials</a></li>
-                <li><a href="/en/latest/contents.html">Reference Guide</a></li>
+                <li><a href="/en/latest/contents.html">Documentation</a></li>
                 <li><a href="https://repo.saltstack.com">Downloads</a></li>
                 <li><a href="/en/latest/topics/development/">Develop</a></li>
                             <!--<li><a href="/en/2016.3/faq/">FAQ</a></li>

doc/conf.py

@@ -214,8 +214,8 @@ project = 'Salt'
 copyright = '2016 SaltStack, Inc.'
 
 version = salt.version.__version__
-latest_release = '2016.3.1'  # latest release
-previous_release = '2015.8.10'  # latest release from previous branch
+latest_release = '2016.3.2'  # latest release
+previous_release = '2015.8.11'  # latest release from previous branch
 previous_release_dir = '2015.8'  # path on web server for previous branch
 next_release = ''  # next release
 next_release_dir = ''  # path on web server for next release branch

doc/topics/releases/2015.8.10.rst

@@ -5,6 +5,12 @@ Salt 2015.8.10 Release Notes
 Version 2015.8.10 is a bugfix release for :doc:`2015.8.0
 </topics/releases/2015.8.0>`.
 
+**Final Release of Debian 7 Packages**
+
+Regular security support for Debian 7 ended on April 25th 2016. As a result,
+2016.3.1 and 2015.8.10 will be the last Salt releases for which Debian
+7 packages are created.
+
 .. admonition:: Mint Linux: Important Post-Upgrade Instructions
 
     As a result of some upstream changes, the ``os`` grain on Mint Linux is now

doc/topics/releases/2015.8.11.rst

@@ -12,6 +12,12 @@ Returner Changes
   accept a ``minions`` keyword argument. All returners which ship with Salt
   have been modified to do so.
 
+Ubuntu 16.04 Packages
+=====================
+
+SaltStack is now providing official Salt 2015.8 `packages
+<http://repo.saltstack.com/2015.8.html#ubuntu>`_ for Ubuntu 16.04.
+
 Changes for v2015.8.10..v2015.8.11
 ----------------------------------
 

doc/topics/releases/2016.3.3.rst

@@ -0,0 +1,6 @@
+===========================
+Salt 2016.3.3 Release Notes
+===========================
+
+Version 2016.3.3 is a bugfix release for :doc:`2016.3.0
+</topics/releases/2016.3.0>`.

salt/minion.py

@@ -351,17 +351,24 @@ def eval_master_func(opts):
     '''
     if '__master_func_evaluated' not in opts:
         # split module and function and try loading the module
-        mod, fun = opts['master'].split('.')
+        mod_fun = opts['master']
+        mod, fun = mod_fun.split('.')
         try:
             master_mod = salt.loader.raw_mod(opts, mod, fun)
+            if not master_mod:
+                raise KeyError
             # we take whatever the module returns as master address
-            opts['master'] = master_mod[mod + '.' + fun]()
+            opts['master'] = master_mod[mod_fun]()
+            if not isinstance(opts['master'], str):
+                raise TypeError
             opts['__master_func_evaluated'] = True
-        except TypeError:
-            log.error("Failed to evaluate master address from module '{0}'".format(
-                      opts['master']))
+        except KeyError:
+            log.error('Failed to load module {0}'.format(mod_fun))
             sys.exit(salt.defaults.exitcodes.EX_GENERIC)
-        log.info('Evaluated master from module: {0}'.format(master_mod))
+        except TypeError:
+            log.error('{0} returned from {1} is not a string'.format(opts['master'], mod_fun))
+            sys.exit(salt.defaults.exitcodes.EX_GENERIC)
+        log.info('Evaluated master from module: {0}'.format(mod_fun))
 
 
 class MinionBase(object):