Merging current develop into stable for v2014.06.28

This commit is contained in:
Pedro Algarvio 2014-06-28 00:31:44 +01:00
commit 8f816db895
3 changed files with 519 additions and 445 deletions

View file

@ -1,3 +1,6 @@
Version 2014.06.28:
* Fixed `tsflags` packages detection for RHEL and Oracle Linux 6.5
Version 2014.06.21:
* Also export the HTTPS proxy environment variable. Thanks Giuseppe Iannello(gianello).
* Distro Support Fixed:

View file

@ -46,14 +46,6 @@ Using ``curl`` to install latest git:
sudo sh install_salt.sh git develop
If you have certificate issues using ``curl``, try the following:
.. code:: console
curl -L https://bootstrap.saltstack.com -o install_salt.sh
sudo sh install_salt.sh git develop
Using ``wget`` to install your distribution's stable packages:
.. code:: console

File diff suppressed because it is too large Load diff