Skip to content

Commit

Permalink
Merge pull request #8 from s0undt3ch/develop
Browse files Browse the repository at this point in the history
Merge current develop branch into Stable for v2014.07.27
  • Loading branch information
s0undt3ch committed Jul 27, 2014
2 parents fe5360a + c00864d commit 4c2e1bc
Show file tree
Hide file tree
Showing 3 changed files with 280 additions and 131 deletions.
1 change: 1 addition & 0 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Juan A. Moyano wincus [email protected]
Karl Grzeszczak karlgrz
Kenneth Wilke KennethWilke
Liu Xiaohui oreh [email protected]
Matthew Garrett cingeyedog [email protected]
Matthew Willson ixela
Matthieu Guegan mguegan
Mike Carlson m87carlson [email protected]
Expand Down
21 changes: 21 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
Version 2014.07.27:
* Amazon Linux AMI 2010.xx is not explicitly not supported.
* Install the `salt-api` scripts if available when the `salt-master` is also installed.
* Added support for a configurable sleep time when starting, restarting and checking for
enabled services.
* Drop the `tsflags` requirement for RHEL and RHEL based distributions.
* When sorting release files, oracle-release has higher priority than redhat-release.
* Distro Support Fixed:
* Debian >= 7 uses system's python-requests package, not PIP
* Install 'python-zypp' in SuSE and openSUSE(required by Salt's zypper module)
* Only install EPEL on requiring distributions if not already installed
* CentOS 7 now uses systemd and the script now properly handles it
* systemd in openSUSE 12.2 complains if service does not contain `.service``
* Properly detect openSUSE using `lsb_release
* SLES 11 SP3 ships with both python-M2Crypto-0.22.* and python-m2crypto-0.21 and we will
be asked which we want to install, even with --non-interactive. Let's try to install the
higher version first and then the lower one in case of failure.
* Allow some extra time on RHEL for the optionals repo check in case the repository
subscription is being managed externally.


Version 2014.06.30:
* Distro Support Fixed:
* Bump build/maintenance version for epel-release package. Thanks Gregory Meno(GregMeno)
Expand Down
Loading

0 comments on commit 4c2e1bc

Please sign in to comment.