Merge pull request #887 from rallytime/merge-stable

[stable] Merge develop into stable branch
saltstack · Jun 24, 2016 · e44c2a2 · e44c2a2
2 parents 39b5446 + 9c0e36b
commit e44c2a2
Show file tree

Hide file tree

Showing 6 changed files with 562 additions and 431 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,7 @@
 /.project
 *.swp
 .vagrant
+
+# Pycharm
+.idea
+
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -11,6 +11,7 @@ abednarik                   abednarik              [email protected]
 Adam Wright                 hipikat                [email protected]
 Alec Koumjian               akoumjian              [email protected]
 Alex Van't Hof              alexvh
+Alexander Krasnukhin        themalkolm             [email protected]
 Angelo Gründler             plueschopath           [email protected]
 Ari Aosved                  devaos                 [email protected]
 Beau Hargis                 beaucephus             [email protected]
@@ -27,6 +28,7 @@ Christer Edwards            cedwards
 Clark Perkins               iclarkperkins          [email protected]
 Dag Viggo Lokøen            dagvl                  [email protected]
 Dan Mick                    dmick                  [email protected]
+Daniel Poelzleithner        poelzi
 David J. Felix              DavidJFelix
 denmat                      denmat
 Denys Havrysh               vutny                  [email protected]
@@ -57,6 +59,7 @@ Karl Grzeszczak             karlgrz
 Kenneth Wilke               KennethWilke
 lomeroe                     lomeroe
 Liu Xiaohui                 oreh                   [email protected]
+Marc Vieira-Cardinal        marccadinal
 Mark Lee                    malept
 Marcus Furlong              furlongm               [email protected]
 markgaylard                 markgaylard
@@ -70,6 +73,7 @@ Michael Scherer             mscherer
 Michele Bologna             mbologna               [email protected]
 Mike Carlson                m87carlson             [email protected]
 Mike Place                  cachedout              [email protected]
+nasenbaer13                 nasenbaer13
 nevins-b                    nevins-b
 Nicole Thomas               rallytime              [email protected]
 Niels Abspoel               aboe76                 [email protected]
@@ -93,6 +97,7 @@ Ronald van Zantvoort        The-Loeki              [email protected]
 RuriRyan                    RuriRyan               [email protected]
 Ryan Walder                 ryanwalder             [email protected]
 Sergey Paramonov            serge-p                [email protected]
+Shane Lee                   twangboy               [email protected]
 Shawn Butts                 shawnbutts
 Skyler Berg                 skylerberg             [email protected]
 Stanislav B                 stanislavb

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,20 @@
+Version 2016.06.24:
+    * Save invocation command and arguments into variables. (jfindlay) #885
+    * Update the authors list with new contributors. (rallytime) #884
+    * Add option to make setup.py install quiet. (nasenbaer13) #865
+    * Fix lint. (jfindlay) #881
+    * Add -R option to allow a custom repo URL. (rallytime) #877
+    * Exclude path of script when called from another dir. (l2ol33rt) #871
+    * Print invocation info. (jfindlay) #869
+    * Always refresh the Arch Linux keyring if needed. (cachedout) #868
+    * Ubuntu 16.04 LTS Xenial Support. (notpeter) #852
+    * Install Salt packages from repo.saltstack.com on Debian 7 "Wheezy". (vutny) #864
+    * Drop support for Debian 6 old-old-stable "squeeze": reached end-of-life. (vutny) #860
+    * Removed ubuntu version restriction for apt-get update. (marccardinal) #859
+    * Fix bootstrapping from git on Debian 8 by installing latest `tornado` via pip. (vutny) #828
+    * Add the ability to override master and/or minion configs from CLI. (rallytime) #841
+    * Don't sleep 11 seconds if the user allowed overwrite of config files. (poelzi) #832
+
 Version 2016.05.11:
     * Only overwrite the minion config file if '-C' is passed. Otherwise, preserve it. (rallytime) #848
 

diff --git a/README.rst b/README.rst
@@ -206,7 +206,7 @@ Supported Operating Systems
 Debian and derivatives
 ~~~~~~~~~~~~~~~~~~~~~~
 
-- Debian GNU/Linux 6/7/8
+- Debian GNU/Linux 7/8
 - Linux Mint Debian Edition 1 (based on Debian 8)
 - Kali Linux 1.0 (based on Debian 7)
 
@@ -238,7 +238,7 @@ Ubuntu and derivatives
 - Linaro 12.04
 - Linux Mint 13/14/16/17
 - Trisquel GNU/Linux 6 (based on Ubuntu 12.04)
-- Ubuntu 10.x/11.x/12.x/13.x/14.x/15.04
+- Ubuntu 10.x/11.x/12.x/13.x/14.x/15.x/16.04
 
 
 Other Linux distro