Merge branch 'develop' into 'stable'

This commit is contained in:
rallytime 2016-08-15 13:05:01 -06:00
commit a631dd9955
3 changed files with 578 additions and 463 deletions

View file

@ -1,3 +1,12 @@
Version 2016.08.15:
* Remove chris-lea python-zmq repo. (rallytime) #929
* Disable the '--enablerepo=${_EPEL_REPO}' part of yum install cmds when passing -R/-r. (rallytime) #928
* Fix grep pattern in `__check_services_sysvinit`. (vutny) #927
* Missing python dependency for salt-cloud added. (toanju) #925
* Fix git install mode when using commit hash with `-g` option. (vutny) #922
* Install `salt-cloud` package with `-L` option in `stable` mode. (vutny) #919
* Fix bootstrapping from Git on CentOS7 when `systemd` is not running. (vutny) #915
Version 2016.07.07:
* Add new contributors to authors list. (rallytime) #910
* Split up python-requests and python-msgpack packages for newer Fedora. (rallytime) #909

View file

@ -211,6 +211,19 @@ Debian and derivatives
- Debian GNU/Linux 7/8
- Linux Mint Debian Edition 1 (based on Debian 8)
- Kali Linux 1.0 (based on Debian 7)
- Raspbian 8 (limited support for ``armhf`` architecture, see the note below)
.. 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
``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.:
.. code:: console
wget -O - https://bootstrap.saltstack.com | sudo sh -s -- -r -P git develop
Red Hat family
@ -287,7 +300,6 @@ are not developed yet:
**Linux**:
- Raspbian (detected as Debian)
- Slackware
**SunOS**
@ -538,6 +550,6 @@ Salt is ready and working in the Docker container with Minion authenticated on M
.. 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/themalkolm/salt-bootstrap?branch=develop&svg=true
:target: https://ci.appveyor.com/project/themalkolm/salt-bootstrap
.. |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

File diff suppressed because it is too large Load diff