Merge pull request #1013 from rallytime/merge-stable

[stable] Merge develop into stable
saltstack · Jan 10, 2017 · b2d6b80 · b2d6b80
2 parents b3e6e97 + d419105
commit b2d6b80
Show file tree

Hide file tree

Showing 4 changed files with 314 additions and 186 deletions.
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -12,6 +12,7 @@ Adam Wright                 hipikat                [email protected]
 Alec Koumjian               akoumjian              [email protected]
 Alex Van't Hof              alexvh
 Alexander Krasnukhin        themalkolm             [email protected]
+Alexey                      dmitrievav
 Angelo Gründler             plueschopath           [email protected]
 Ari Aosved                  devaos                 [email protected]
 Beau Hargis                 beaucephus             [email protected]
@@ -35,6 +36,7 @@ denmat                      denmat
 Denys Havrysh               vutny                  [email protected]
 deployboy                   deployboy
 Diego Woitasen              diegows                [email protected]
+ek9                         ek9
 Elias Probst                eliasp
 eliezerlp                   eliezerlp
 Emiel Kollof                ekollof
@@ -66,8 +68,9 @@ lomeroe                     lomeroe
 Liu Xiaohui                 oreh                   [email protected]
 Lubomir Host                lhost
 Marc Vieira-Cardinal        marccadinal
-Mark Lee                    malept
+Marco Molteni               marco-m
 Marcus Furlong              furlongm               [email protected]
+Mark Lee                    malept
 markgaylard                 markgaylard
 Matt Black                  mafrosis
 Matthew Garrett             cingeyedog             [email protected]

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,23 @@
+Version 2017.01.10:
+    * Update AUTHORS.rst with new contributors (rallytime) #1011
+    * fix bootstrap in Arch Linux by updating package name from salt-zmq to salt (ek9) #1007
+    * Add python-systemd package to debian 8 git install (rallytime) #1003
+    * Updated supported versions for Ubuntu: 12.04, 14.04, 16.04, and 16.10 (best effort) (rallytime) #1002
+    * Add "yakkety" to ubuntu_codename_translation function (rallytime) #1001
+    * Update supported versions for Fedora: 23, 24, and 25. (rallytime) #1000
+    * Handle renaming of gnupg-curl to gnupg1-curl for Ubuntu 16.10 (marco-m) #998
+    * fix systemctl path (dmitrievav) #997
+    * Drop unnecessary workarounds (creating directories) for early releases (vutny) #995
+    * Let's detect newly released Salt 2016.11 stable release (vutny) #994
+    * Adjust code examples to use the actual bootstrap-salt.sh file name (rallytime) #993
+    * Install TLS certs before cloning git repo via https (vutny) #991
+    * Remove fix me comment and fix systemsmanagement link (rallytime) #990
+    * Correct usage description about "config only" mode (vutny) #989
+    * Fix overwriting Minion config from temporarily directory (vutny) #988
+    * Configure Salt components after the dependencies installation (vutny) #987
+    * Add CloudLinux support (rallytime) #986
+    * Apply the insecure flag to git as well (cachedout) #981
+
 Version 2016.10.25:
     * Update AUTHORS.rst with new contributors (rallytime) #978
     * Let's start detecting the upcoming Debian 9 (Stretch) (lhost) #975

diff --git a/README.rst b/README.rst
@@ -58,37 +58,37 @@ Using ``curl`` to install latest development version from GitHub:
 
 .. code:: console
 
-  curl -o bootstrap_salt.sh -L https://bootstrap.saltstack.com
-  sudo sh bootstrap_salt.sh git develop
+  curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+  sudo sh bootstrap-salt.sh git develop
 
 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 v2016.3.2
+  curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+  sudo sh bootstrap-salt.sh git v2016.3.2
 
 To install a specific branch from a Git fork:
 
 .. code:: console
 
-  curl -o bootstrap_salt.sh -L https://bootstrap.saltstack.com
-  sudo sh bootstrap_salt.sh -g https://github.com/myuser/salt.git git mybranch
+  curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+  sudo sh bootstrap-salt.sh -g https://github.com/myuser/salt.git git mybranch
 
 If all you want is to install a ``salt-master`` using latest Git:
 
 .. code:: console
 
-  curl -o bootstrap_salt.sh -L https://bootstrap.saltstack.com
-  sudo sh bootstrap_salt.sh -M -N git develop
+  curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+  sudo sh bootstrap-salt.sh -M -N git develop
 
 If your host has Internet access only via HTTP proxy:
 
 .. code:: console
 
   PROXY='http://user:[email protected]:3128'
-  curl -o bootstrap_salt.sh -L -x "$PROXY" https://bootstrap.saltstack.com
-  sudo sh bootstrap_salt.sh -H "$PROXY" git
+  curl -o bootstrap-salt.sh -L -x "$PROXY" https://bootstrap.saltstack.com
+  sudo sh bootstrap-salt.sh -H "$PROXY" git
 
 
 Install using wget
@@ -98,15 +98,15 @@ Using ``wget`` to install your distribution's stable packages:
 
 .. code:: console
 
-  wget -O bootstrap_salt.sh https://bootstrap.saltstack.com
-  sudo sh bootstrap_salt.sh
+  wget -O bootstrap-salt.sh https://bootstrap.saltstack.com
+  sudo sh bootstrap-salt.sh
 
 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.11
+  wget -O bootstrap-salt.sh https://bootstrap.saltstack.com
+  sudo sh bootstrap-salt.sh -P git v2015.8.11
 
 .. note::
 
@@ -121,15 +121,15 @@ If you already have Python installed, ``python 2.6``, then it's as easy as:
 
 .. code:: console
 
-  python -m urllib "https://bootstrap.saltstack.com" > bootstrap_salt.sh
-  sudo sh bootstrap_salt.sh git develop
+  python -m urllib "https://bootstrap.saltstack.com" > bootstrap-salt.sh
+  sudo sh bootstrap-salt.sh git develop
 
 All Python versions should support the following in-line code:
 
 .. code:: console
 
-  python -c 'import urllib; print urllib.urlopen("https://bootstrap.saltstack.com").read()' > bootstrap_salt.sh
-  sudo sh bootstrap_salt.sh git develop
+  python -c 'import urllib; print urllib.urlopen("https://bootstrap.saltstack.com").read()' > bootstrap-salt.sh
+  sudo sh bootstrap-salt.sh git develop
 
 
 Install using fetch
@@ -140,8 +140,8 @@ have ``fetch`` available though:
 
 .. code:: console
 
-  fetch -o bootstrap_salt.sh https://bootstrap.saltstack.com
-  sudo sh bootstrap_salt.sh
+  fetch -o bootstrap-salt.sh https://bootstrap.saltstack.com
+  sudo sh bootstrap-salt.sh
 
 If you have any SSL issues install ``ca_root_nssp``:
 
@@ -200,7 +200,7 @@ Supported Operating Systems
 .. note::
 
   Bootstrap may fail to install Salt on the cutting-edge version of distributions with frequent
-  release cycle, such as: Amazon Linux, Fedora, openSUSE Tumbleweed or Ubuntu non-LTS. Check the
+  release cycles such as: Amazon Linux, Fedora, openSUSE Tumbleweed, or Ubuntu non-LTS. Check the
   versions from the list below. Also, see the `Unsupported Distro`_ and
   `Adding Support for Other Operating Systems`_ sections.
 
@@ -216,8 +216,8 @@ Debian and derivatives
 .. note::
 
   Installation of Salt packages on Debian 8 based distribution from repo.saltstack.com repository
-  is currently supported for ``amd64`` (``x86-64``) and ``armhf`` architechtures ONLY. Use ``git``
-  bootstrap mode as described above to install Salt on other architechtures, such as ``i386`` or
+  is currently supported for ``amd64`` (``x86-64``) and ``armhf`` architectures ONLY. Use ``git``
+  bootstrap mode as described above to install Salt on other architectures, such as ``i386`` or
   ``armel``. You also may need to disable repository configuration and allow ``pip`` installations
   by providing ``-r`` and ``-P`` options to the bootstrap script, i.e.:
 
@@ -231,7 +231,7 @@ Red Hat family
 
 - Amazon Linux 2012.09/2013.03/2013.09/2014.03/2014.09
 - CentOS 5/6/7
-- Fedora 17/18/20/21/22
+- Fedora 23/24/25
 - Oracle Linux 5/6/7
 - Red Hat Enterprise Linux 5/6/7
 - Scientific Linux 5/6/7
@@ -251,9 +251,22 @@ Ubuntu and derivatives
 
 - Elementary OS 0.2 (based on Ubuntu 12.04)
 - Linaro 12.04
-- Linux Mint 13/14/16/17/18
+- Linux Mint 13/17/18
 - Trisquel GNU/Linux 6 (based on Ubuntu 12.04)
-- Ubuntu 10.x/11.x/12.x/13.x/14.x/15.x/16.04
+- Ubuntu 12.04/14.04/16.04
+
+Ubuntu Best Effort Support: Non-LTS Releases 
+********************************************
+
+This script provides best-effort support for current, non-LTS Ubuntu releases. If package 
+repositories are not provided on `SaltStack's Ubuntu repository`_ for the non-LTS release, the
+bootstrap script will attempt to install the packages for the most closely related LTS Ubuntu
+release instead.
+
+For example, when installing Salt on Ubuntu 16.10, the bootstrap script will setup the repository 
+for Ubuntu 16.04 from `SaltStack's Ubuntu repository`_ and install the 16.04 packages.
+
+.. _`SaltStack's Ubuntu repository`: http://repo.saltstack.com/#ubuntu
 
 
 Other Linux distro
@@ -479,8 +492,8 @@ version.
 
 .. code:: console
 
-  curl -o bootstrap_salt.sh -L https://bootstrap.saltstack.com/develop
-  sudo sh bootstrap_salt.sh git develop
+  curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com/develop
+  sudo sh bootstrap-salt.sh git develop
 
 
 Or the insecure one liner: