Merge pull request #980 from rallytime/merge-stable

[stable] Merge develop into stable
saltstack · Oct 25, 2016 · b3e6e97 · b3e6e97
2 parents 13cf650 + 9e301c0
commit b3e6e97
Show file tree

Hide file tree

Showing 6 changed files with 443 additions and 480 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 /.project
-*.swp
+*.sw?
 .vagrant
 
 # Pycharm
 .idea
-
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -20,6 +20,7 @@ Brad Thurber                bradthurber
 Brandon Clifford            brandon099             [email protected]
 Bret Fisher                 BretFisher             [email protected]
 bruce-one                   bruce-one
+Вячеслав Спиридонов         sp1r
 C. R. Oldham                cro                    [email protected]
 Cam                         camereonsparr
 Chris Rebert                cvrebert               [email protected]
@@ -37,9 +38,11 @@ Diego Woitasen              diegows                [email protected]
 Elias Probst                eliasp
 eliezerlp                   eliezerlp
 Emiel Kollof                ekollof
+Eric Radman                 eradman                [email protected]
 Erik Ankrom                 erikankrom
 Erik Johnson                terminalmage           [email protected]
 EYJ                         eyj
+fizmat                      fizmat
 Forrest Alvarez             gravyboat
 Fred Reimer                 freimer                [email protected]
 Geoff Garside               geoffgarside           [email protected]
@@ -55,12 +58,13 @@ Jared E Stroud              jaredestroud           [email protected]
 Jeff Hui                    jeffh                  [email protected]
 Jeff Strunk                 jstrunk
 Juan A. Moyano              wincus                 [email protected]
-Justin Anderson             jtand                  janderson@saltstack.com
+Justin Anderson             justinta               justin.ta@outlook.com
 Justin Findlay              jfindlay               [email protected]
 Karl Grzeszczak             karlgrz
 Kenneth Wilke               KennethWilke
 lomeroe                     lomeroe
 Liu Xiaohui                 oreh                   [email protected]
+Lubomir Host                lhost
 Marc Vieira-Cardinal        marccadinal
 Mark Lee                    malept
 Marcus Furlong              furlongm               [email protected]
@@ -86,6 +90,7 @@ Paul Brian                  lifeisstillgood        [email protected]
 Pavel Snagovsky             paha
 Pedro Algarvio              s0undt3ch              [email protected]
 Pedro Paulo                 pedropaulovc
+Pete Lumbis                 plumbis
 Peter Tripp                 notpeter
 Petr Michalec               epcim
 Prayag Verma                pra85                  [email protected]

diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,24 @@
-Version 2106.08.16:
+Version 2016.10.25:
+    * Update AUTHORS.rst with new contributors (rallytime) #978
+    * Let's start detecting the upcoming Debian 9 (Stretch) (lhost) #975
+    * FreeBSD: set _SALT_ETC_DIR directory to match ports (eradman) #970
+    * Update OpenBSD 6.0+ provisioning (eradman) #969
+    * adds supports for Cumulus Linux (plumbis) #967
+    * Run "pip install -U futures" for SmartOS git install (rallytime) #966
+    * Change /pkg/rpm/ to /pkg/deb/ in install_ubuntu_git_post func (rallytime) #965
+    * SUSE: Refactor systemsmanagement_saltstack repo checks to be DRY (rallytime) #964
+    * Fix detection of EPEL repository with not-expired metadata (sp1r) #963
+    * Display warning message about deprecating the `-G` option (vutny) #958
+    * Allow correct salt paths to be used when -c is passed (justinta) #955
+    * Fix issues with replacing configs when python3 is default in os. (fizmat) #954
+    * Remove m2crypto package installs (rallytime) #951
+    * Try to install SP4 packages on SLE 11 when SP version is older (rallytime) #950
+    * Add python-futures package to install_centos_git_deps (rallytime) #948
+    * Add /etc/portage/package.accept_keywords to CONFIG_PROTECT_MASK (rallytime) #947
+    * Deprecate `-G` option: use `https` scheme for GitHub by default (vutny) #945
+    * [SECURITY] Properly handle GnuPG keys for APT repositories (vutny) #940
+
+Version 2016.08.16:
     * Ubuntu git mode: install all deps from SaltStack corp repo by default. (vutny) #936
 
 Version 2016.08.15:

diff --git a/README.rst b/README.rst
@@ -66,7 +66,7 @@ If you want to install a specific release version (based on the Git tags):
 .. code:: console
 
   curl -o bootstrap_salt.sh -L https://bootstrap.saltstack.com
-  sudo sh bootstrap_salt.sh git v2015.8.8
+  sudo sh bootstrap_salt.sh git v2016.3.2
 
 To install a specific branch from a Git fork:
 
@@ -88,7 +88,7 @@ If your host has Internet access only via HTTP proxy:
 
   PROXY='http://user:[email protected]:3128'
   curl -o bootstrap_salt.sh -L -x "$PROXY" https://bootstrap.saltstack.com
-  sudo sh bootstrap_salt.sh -G -H "$PROXY" git
+  sudo sh bootstrap_salt.sh -H "$PROXY" git
 
 
 Install using wget
@@ -106,7 +106,7 @@ Installing a specific version from git using ``wget``:
 .. code:: console
 
   wget -O bootstrap_salt.sh https://bootstrap.saltstack.com
-  sudo sh bootstrap_salt.sh -P git v2015.8.7
+  sudo sh bootstrap_salt.sh -P git v2015.8.11
 
 .. note::
 
@@ -548,8 +548,8 @@ Salt is ready and working in the Docker container with Minion authenticated on M
 .. _`pre-accepted Minion key`: https://docs.saltstack.com/en/latest/topics/tutorials/preseed_key.html
 
 
-.. vim: fenc=utf-8 spell spl=en cc=100 tw=99 fo=want sts=2 sw=2 et
-
 .. |windows_build|  image:: https://ci.appveyor.com/api/projects/status/github/saltstack/salt-bootstrap?branch=develop&svg=true
     :target: https://ci.appveyor.com/project/saltstack-public/salt-bootstrap
     :alt: Build status of the develop branch on Windows
+
+.. vim: fenc=utf-8 spell spl=en cc=100 tw=99 fo=want sts=2 sw=2 et