mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-16 01:30:21 +00:00
Merge branch 'develop' into stable for v2015.05.04
This commit is contained in:
Pedro Algarvio
commit
a62337e907
4 changed files with 523 additions and 115 deletions
14
AUTHORS.rst
14
AUTHORS.rst
|
|
@ -12,15 +12,19 @@ Alex Van't Hof alexvh
|
|||
Angelo Gründler plueschopath angelo.gruendler@w1r3.net
|
||||
Ari Aosved devaos ari.aosved@gmail.com
|
||||
Boris Feld Lothiraldan
|
||||
Brad Thurber bradthurber
|
||||
bruce-one bruce-one
|
||||
C. R. Oldham cro cr@saltstack.com
|
||||
Cam camereonsparr
|
||||
Chris Rebert cvrebert chris.rebert@hulu.com
|
||||
Christer Edwards cedwards
|
||||
Dag Viggo Lokøen dagvl dag.viggo@lokoen.org
|
||||
Dan Mick dmick dan.mick@inktank.com
|
||||
David J. Felix DavidJFelix
|
||||
deployboy deployboy
|
||||
Diego Woitasen diegows diego.woitasen@vhgroup.net
|
||||
Diego Woitasen diegows diego@flugel.it
|
||||
Elias Probst eliasp
|
||||
Erik Ankrom erikankrom
|
||||
Erik Johnson terminalmage erik@saltstack.com
|
||||
Forrest Alvarez gravyboat
|
||||
Fred Reimer freimer freimer@freimer.org
|
||||
|
|
@ -38,15 +42,20 @@ Juan A. Moyano wincus wincus.public@gmail.com
|
|||
Karl Grzeszczak karlgrz
|
||||
Kenneth Wilke KennethWilke
|
||||
Liu Xiaohui oreh herolxh@gmail.com
|
||||
Mark Lee malept
|
||||
markgaylard markgaylard
|
||||
Matt Black mafrosis
|
||||
Matthew Garrett cingeyedog matt@clemson.edu
|
||||
Matthew Mead-Briggs mattmb
|
||||
Matthew Willson ixela
|
||||
Matthieu Guegan mguegan
|
||||
Michael Scherer mscherer
|
||||
Mike Carlson m87carlson mike@bayphoto.com
|
||||
Mike Place cachedout mp@saltstack.com
|
||||
nevins-b nevins-b
|
||||
Niels Abspoel aboe76
|
||||
Nitin Madhok nmadhok nmadhok@clemson.edu
|
||||
panticz panticz
|
||||
Paul Brian lifeisstillgood paul@mikadosoftware.com
|
||||
Pavel Snagovsky paha
|
||||
Pedro Algarvio s0undt3ch pedro@algarvio.me
|
||||
|
|
@ -54,11 +63,14 @@ Pedro Paulo pedropaulovc
|
|||
ptonelli ptonelli
|
||||
Raymond Barbiero visualphoenix
|
||||
Roberto Aguilar rca roberto@baremetal.io
|
||||
Roman Inflianskas rominf infroma@gmail.com
|
||||
Ronald van Zantvoort The-Loeki ronald@pcextreme.nl
|
||||
Skyler Berg skylerberg skylertheberg@gmail.com
|
||||
Tate Eskew tateeskew
|
||||
Thomas S. Hatch thatch45 thatch45@saltstack.com
|
||||
Tony Narlock tony
|
||||
Valentin Bud valentinbud valentin@databus.pro
|
||||
Vladimir Kozhukalov kozhukalov
|
||||
Whit Morriss whitmo whit@nocoast.us
|
||||
Wout wfhg
|
||||
========================== ===================== ============================
|
||||
|
|
|
|||
15
ChangeLog
15
ChangeLog
|
|
@ -1,3 +1,18 @@
|
|||
Version 2015.05.04:
|
||||
* Fix the configuration path for FreeBSD. #567/#552. Thanks Ronald van Zantvoort(The-Loeki).
|
||||
+ Fix non grouping support in POSIX sed. Thanks Ronald van Zantvoort(The-Loeki).
|
||||
* Add Debian 8 support. Thanks Matt Black(mafrosis)
|
||||
* Improve Debian version parsing. Thanks Mark Lee(malept)
|
||||
* Make sure we update packages list one Chris Lea's PPA repository is added.
|
||||
* Hard code the Debian Squeeze backports to the DE mirror since the main repository is down.
|
||||
Thanks @panticz. #589.
|
||||
* Only install git if not already installed. #560
|
||||
* Fix openSUSE 13.2 where we need to pass --replaceflags. Thanks Roman Inflianskas(rominf).
|
||||
#504.
|
||||
* Make sure that a recent enough requests package is installed in Debian/Ubuntu.
|
||||
* Install tornado on git installs for the develop branch if necessary. #580
|
||||
* Add support for Ubuntu 15.04
|
||||
|
||||
Version 2015.03.15:
|
||||
* Add multi-master support. Thanks Fred Reimer(freimer). #555
|
||||
|
||||
|
|
|
|||
22
README.rst
22
README.rst
|
|
@ -88,19 +88,19 @@ have ``fetch`` available though:
|
|||
|
||||
If you have any SSL issues install ``ca_root_nssp``:
|
||||
|
||||
..code:: console
|
||||
.. code:: console
|
||||
|
||||
pkg install ca_root_nssp
|
||||
|
||||
And either copy the certificates to the place where fetch can find them:
|
||||
|
||||
..code:: console
|
||||
.. code:: console
|
||||
|
||||
cp /usr/local/share/certs/ca-root-nss.crt /etc/ssl/cert.pem
|
||||
|
||||
Or link them to the right place:
|
||||
|
||||
..code:: console
|
||||
.. code:: console
|
||||
|
||||
ln -s /usr/local/share/certs/ca-root-nss.crt /etc/ssl/cert.pem
|
||||
|
||||
|
|
@ -319,21 +319,21 @@ Supported Operating Systems
|
|||
---------------------------
|
||||
- Amazon Linux 2012.09
|
||||
- Arch
|
||||
- CentOS 5/6
|
||||
- Debian 6.x/7.x/8(git installations only)
|
||||
- Fedora 17/18
|
||||
- CentOS 5/6/7
|
||||
- Debian 6/7/8
|
||||
- Fedora 17/18/20/21/22
|
||||
- FreeBSD 9.1/9.2/10
|
||||
- Gentoo
|
||||
- Linaro
|
||||
- Linux Mint 13/14
|
||||
- OpenSUSE 12.x
|
||||
- OpenSUSE 12/13
|
||||
- Oracle Linux 5/5
|
||||
- Red Hat 5/6
|
||||
- Red Hat Enterprise 5/6
|
||||
- Scientific Linux 5/6
|
||||
- SmartOS
|
||||
- SuSE 11 SP1/11 SP2
|
||||
- Ubuntu 10.x/11.x/12.x/13.04/13.10
|
||||
- SUSE Linux Enterprise 11 SP1/11 SP2/11 SP3
|
||||
- Ubuntu 10.x/11.x/12.x/13.x/14.x/15.04
|
||||
- Elementary OS 0.2
|
||||
|
||||
|
||||
|
|
@ -381,7 +381,9 @@ Please run the following commands and report their output when creating a ticket
|
|||
Testing in Vagrant
|
||||
------------------
|
||||
You can use Vagrant_ to easily test changes on a clean machine. The ``Vagrantfile`` defaults to an
|
||||
Ubuntu box. First, install Vagrant, then::
|
||||
Ubuntu box. First, install Vagrant, then:
|
||||
|
||||
.. code:: console
|
||||
|
||||
$ vagrant up
|
||||
$ vagrant ssh
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Reference in a new issue