Browse files

Merge branch 'master' of github.com:mdxp/chef-repo-jenkins

  • Loading branch information...
2 parents 6c21588 + eb543d8 commit d2a1f1ae5f4e5789e2dddc186a5ad9961d556025 Jenkins CI committed May 8, 2012
View
2 .chef_jenkins_last_commit
@@ -1 +1 @@
-76a233e70beeb744daa6e9697c4453bcde1aee45
+ffaebc47d033bbd69edfc6ae6e598eeed3f36102
View
2 cookbooks/mysql/metadata.rb
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Installs and configures mysql for client or server"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version "1.2.4"
+version '1.2.5'
recipe "mysql", "Includes the client recipe to configure a client"
recipe "mysql::client", "Installs packages required for mysql clients using run_action magic"
recipe "mysql::server", "Installs packages required for mysql servers w/o manual intervention"
View
2 cookbooks/openssl/metadata.rb
@@ -3,6 +3,6 @@
license "Apache 2.0"
description "Provides a library with a method for generating secure random passwords."
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version "1.0.0"
+version '1.0.1'
recipe "openssl", "Empty, this cookbook provides a library, see README.md"
View
2 cookbooks/php/metadata.rb
@@ -2,7 +2,7 @@
maintainer_email "cookbooks@opscode.com"
license "Apache 2.0"
description "Installs and maintains php and php modules"
-version "1.0.2"
+version '1.0.3'
depends "build-essential"
depends "xml"
View
2 cookbooks/xml/metadata.rb
@@ -3,7 +3,7 @@
license "Apache 2.0"
description "Installs xml"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version "1.0.2"
+version '1.0.3'
recipe "xml", "Installs libxml development packages"
View
16 environments/dev.json
@@ -5,17 +5,21 @@
"json_class": "Chef::Environment",
"description": "",
"cookbook_versions": {
- "jenkins": "= 0.6.4",
+ "xml": "= 1.0.3",
"runit": "= 0.15.1",
- "ohai": "= 1.0.3",
+ "jenkins": "= 0.6.4",
+ "mysql": "= 1.2.5",
+ "php": "= 1.0.3",
"iptables": "= 0.10.7",
- "java": "= 1.5.1",
- "vim": "= 1.0.3",
- "nginx": "= 0.101.3",
+ "ohai": "= 1.0.3",
"dotdeb": "= 0.1.2",
+ "nginx": "= 0.101.3",
+ "vim": "= 1.0.3",
+ "java": "= 1.5.1",
+ "openssl": "= 1.0.1",
"php-fpm": "= 0.1.1",
- "build-essential": "= 1.0.1",
"apache2": "= 1.2.12",
+ "build-essential": "= 1.0.1",
"bluepill": "= 1.0.5"
},
"override_attributes": {

0 comments on commit d2a1f1a

Please sign in to comment.