Merge branch 'master' into fix_db_credentials_security

RiotGames-Archive · Apr 3, 2013 · 9075307 · 9075307
2 parents 5286061 + 23d4c2a
commit 9075307
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/Berksfile.lock b/Berksfile.lock
diff --git a/README.md b/README.md
@@ -108,6 +108,10 @@ TODO :
 
 CHANGELOG :
 ===========
+### 0.0.42
+	* Adds Berkshelf/Vagrant 1.1 compatibility (andrewGarson)
+	* Moves recipe[yum::epel] to a documented runlist dependency instead of forcing you to use it via include_recipe
+
 ### 0.0.41
 	* Format metadata and add support for Oracle linux (Thanks to tas50 and his love for oracle Linux)
 	* Fix about redhat LSB in agent-prebuild recipe (Thanks nutznboltz)

diff --git a/metadata.rb b/metadata.rb
@@ -4,7 +4,7 @@
 license          "Apache 2.0"
 description      "Installs/Configures Zabbix Agent/Server"
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          "0.0.41"
+version          "0.0.42"
 supports         "ubuntu", ">= 10.04"
 supports         "debian", ">= 6.0"
 supports         "redhat", ">= 5.0"