Merge branch 'develop' into stable for next stable release

saltstack · Sep 9, 2014 · 46e6746 · 46e6746
2 parents 40c2289 + 0a7d35f
commit 46e6746
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 21 deletions.
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -25,7 +25,7 @@ Geoff Garside               geoffgarside           [email protected]
 Giuseppe Iannello           giannello              [email protected]
 Gregory Meno                GregMeno               [email protected]
 Guillaume Derval            GuillaumeDerval        [email protected]
-                            gweis
+gweis                       gweis
 Henrik Holmboe              holmboe
 Jeff Hui                    jeffh                  [email protected]
 Jeff Strunk                 jstrunk
@@ -34,13 +34,15 @@ Karl Grzeszczak             karlgrz
 Kenneth Wilke               KennethWilke
 Liu Xiaohui                 oreh                   [email protected]
 Matthew Garrett             cingeyedog             [email protected]
+Matthew Mead-Briggs         mattmb
 Matthew Willson             ixela
 Matthieu Guegan             mguegan
 Mike Carlson                m87carlson             [email protected]
 nevins-b                    nevins-b
 Niels Abspoel               aboe76
 Paul Brian                  lifeisstillgood        [email protected]
 Pedro Algarvio              s0undt3ch              [email protected]
+Pedro Paulo                 pedropaulovc
 Raymond Barbiero            visualphoenix
 Roberto Aguilar             rca                    [email protected]
 Tate Eskew                  tateeskew

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+Version 2014.09.09:
+	* Distro Support Fixes:
+		* Updated the URL for EPEL 7
+		* PIP based installations on Ubuntu 10.04 need setuptools installed
+		* Arch stopped providing the version information on `/etc/arch-release`
+		* Complete `salt-api` services checking. #450
+
 Version 2014.08.30:
 	* Skip service checks for `salt-api`, since this should be an opt-in service not necessarily 
 	meant to start at boot time.