Skip to content

Commit 46e6746

Browse files
committed
Merge branch 'develop' into stable for next stable release
2 parents 40c2289 + 0a7d35f commit 46e6746

File tree

3 files changed

+90
-21
lines changed

3 files changed

+90
-21
lines changed

AUTHORS.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Geoff Garside geoffgarside geoff@geoffgarside.co.uk
2525
Giuseppe Iannello giannello giuseppe.iannello@brokenloop.net
2626
Gregory Meno GregMeno gregory.meno@inktank.com
2727
Guillaume Derval GuillaumeDerval guillaume@guillaumederval.be
28-
gweis
28+
gweis gweis
2929
Henrik Holmboe holmboe
3030
Jeff Hui jeffh jeff@jeffhui.net
3131
Jeff Strunk jstrunk
@@ -34,13 +34,15 @@ Karl Grzeszczak karlgrz
3434
Kenneth Wilke KennethWilke
3535
Liu Xiaohui oreh herolxh@gmail.com
3636
Matthew Garrett cingeyedog matt@clemson.edu
37+
Matthew Mead-Briggs mattmb
3738
Matthew Willson ixela
3839
Matthieu Guegan mguegan
3940
Mike Carlson m87carlson mike@bayphoto.com
4041
nevins-b nevins-b
4142
Niels Abspoel aboe76
4243
Paul Brian lifeisstillgood paul@mikadosoftware.com
4344
Pedro Algarvio s0undt3ch pedro@algarvio.me
45+
Pedro Paulo pedropaulovc
4446
Raymond Barbiero visualphoenix
4547
Roberto Aguilar rca roberto@baremetal.io
4648
Tate Eskew tateeskew

ChangeLog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
Version 2014.09.09:
2+
* Distro Support Fixes:
3+
* Updated the URL for EPEL 7
4+
* PIP based installations on Ubuntu 10.04 need setuptools installed
5+
* Arch stopped providing the version information on `/etc/arch-release`
6+
* Complete `salt-api` services checking. #450
7+
18
Version 2014.08.30:
29
* Skip service checks for `salt-api`, since this should be an opt-in service not necessarily
310
meant to start at boot time.

0 commit comments

Comments
 (0)