Skip to content

Commit 4c2e1bc

Browse files
committed
Merge pull request #8 from s0undt3ch/develop
Merge current develop branch into Stable for v2014.07.27
2 parents fe5360a + c00864d commit 4c2e1bc

File tree

3 files changed

+280
-131
lines changed

3 files changed

+280
-131
lines changed

AUTHORS.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Juan A. Moyano wincus [email protected]
3131
Karl Grzeszczak karlgrz
3232
Kenneth Wilke KennethWilke
3333
Liu Xiaohui oreh [email protected]
34+
Matthew Garrett cingeyedog [email protected]
3435
Matthew Willson ixela
3536
Matthieu Guegan mguegan
3637
Mike Carlson m87carlson [email protected]

ChangeLog

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
Version 2014.07.27:
2+
* Amazon Linux AMI 2010.xx is not explicitly not supported.
3+
* Install the `salt-api` scripts if available when the `salt-master` is also installed.
4+
* Added support for a configurable sleep time when starting, restarting and checking for
5+
enabled services.
6+
* Drop the `tsflags` requirement for RHEL and RHEL based distributions.
7+
* When sorting release files, oracle-release has higher priority than redhat-release.
8+
* Distro Support Fixed:
9+
* Debian >= 7 uses system's python-requests package, not PIP
10+
* Install 'python-zypp' in SuSE and openSUSE(required by Salt's zypper module)
11+
* Only install EPEL on requiring distributions if not already installed
12+
* CentOS 7 now uses systemd and the script now properly handles it
13+
* systemd in openSUSE 12.2 complains if service does not contain `.service``
14+
* Properly detect openSUSE using `lsb_release
15+
* SLES 11 SP3 ships with both python-M2Crypto-0.22.* and python-m2crypto-0.21 and we will
16+
be asked which we want to install, even with --non-interactive. Let's try to install the
17+
higher version first and then the lower one in case of failure.
18+
* Allow some extra time on RHEL for the optionals repo check in case the repository
19+
subscription is being managed externally.
20+
21+
122
Version 2014.06.30:
223
* Distro Support Fixed:
324
* Bump build/maintenance version for epel-release package. Thanks Gregory Meno(GregMeno)

0 commit comments

Comments
 (0)