Update to the latest version of all cookbooks, some of which loosen v…

…ersion restrictions so bprobe works
rubygems · Jul 30, 2014 · 55adcd3 · 55adcd3
1 parent 0953bf3
commit 55adcd3
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 32 deletions.
diff --git a/Berksfile b/Berksfile
@@ -36,6 +36,7 @@ cookbook 'rubygems-utility', path: 'cookbooks/rubygems-utility'
 # Add cookbooks which diverge from the versions available on the community
 # site.
 cookbook 'aptly', git: 'git@github.com:skottler/aptly.git', ref: 'fix_seed'
+cookbook 'bprobe', git: 'git@github.com:boundary/bprobe_cookbook.git'
 cookbook 'collectd_plugins', git: 'git@github.com:skottler/chef-collectd_plugins.git'
 cookbook 'collectd', git: 'git@github.com:librato/collectd-cookbook.git'
 cookbook 'collectd-librato', git: 'git@github.com:librato/collectd-librato-cookbook.git'

diff --git a/Berksfile.lock b/Berksfile.lock
@@ -3,6 +3,9 @@ DEPENDENCIES
     git: git@github.com:skottler/aptly.git
     revision: 4be943dc19445481780a6e458b6d29b9aa90c912
     ref: fix_see
+  bprobe
+    git: git@github.com:boundary/bprobe_cookbook.git
+    revision: 61fec6bc9873b09129f1e86b1e7ecf4c6b97ebd9
   collectd
     git: git@github.com:librato/collectd-cookbook.git
     revision: bb26f55d7747f0f6e7de93c198161b0613fe62eb
@@ -78,14 +81,18 @@ DEPENDENCIES
     revision: ba79afeb421fea8c6869befc3e508c6f70b92510
 
 GRAPH
-  apache2 (1.10.4)
+  apache2 (1.11.0)
+    freebsd (>= 0.0.0)
     iptables (>= 0.0.0)
     logrotate (>= 0.0.0)
     pacman (>= 0.0.0)
   apt (2.4.0)
   aptly (0.2.1)
     apt (>= 0.0.0)
   aws (2.3.0)
+  bprobe (0.2.0)
+    apt (>= 0.0.0)
+    yum (<= 2.4.4)
   build-essential (2.0.4)
   chef-client (3.6.0)
     cron (>= 1.2.0)
@@ -112,37 +119,39 @@ GRAPH
     build-essential (>= 0.0.0)
     openssh (>= 0.0.0)
   dwradcliffe-dnsimple (0.5.2)
-  erlang (1.5.4)
+  erlang (1.3.6)
     apt (>= 1.7.0)
     build-essential (>= 0.0.0)
-    yum (~> 3.0)
-    yum-epel (>= 0.0.0)
-    yum-erlang_solutions (>= 0.0.0)
-  fail2ban (2.1.2)
-    yum (~> 3.0)
-    yum-epel (>= 0.0.0)
-  git (4.0.2)
+    yum (< 3.0.0)
+  fail2ban (2.0.4)
+    yum (< 3.0.0)
+  freebsd (0.1.4)
+  git (2.8.4)
     build-essential (>= 0.0.0)
     dmg (>= 0.0.0)
     runit (>= 1.0.0)
     windows (>= 0.0.0)
-    yum (~> 3.0)
-    yum-epel (>= 0.0.0)
+    yum (< 3.0.0)
   hostname (0.3.0)
     hostsfile (>= 0.0.0)
   hostsfile (2.4.5)
   iptables (0.13.2)
-  jenkins (2.1.2)
-    apt (~> 2.0)
-    runit (~> 1.5)
-    yum (~> 3.0)
+  java (1.24.0)
+  jenkins (1.2.2)
+    apache2 (>= 0.0.0)
+    apt (>= 0.0.0)
+    iptables (>= 0.0.0)
+    java (>= 0.0.0)
+    nginx (>= 0.0.0)
+    runit (>= 1.0.0)
+    yum (>= 0.0.0)
   logrotate (1.6.0)
-  memcached (1.1.2)
-    runit (>= 0.0.0)
+  memcached (1.6.6)
+    runit (~> 1.0)
+    yum (< 3.0.0)
   motd (0.4.1)
     chef_handler (>= 0.0.0)
-  mysql (5.3.6)
-    yum-mysql-community (>= 0.0.0)
+  mysql (5.2.12)
   mysql-chef_gem (0.0.2)
     build-essential (>= 0.0.0)
     mysql (>= 0.0.0)
@@ -283,11 +292,10 @@ GRAPH
   rubygems-ssh (0.0.4)
     openssh (>= 0.0.0)
   rubygems-utility (0.0.3)
-  runit (1.5.10)
+  runit (1.4.6)
     build-essential (>= 0.0.0)
-    yum (~> 3.0)
-    yum-epel (>= 0.0.0)
-  sensu (1.0.0)
+    yum (< 3.0.0)
+  sensu (2.0.0)
     apt (>= 0.0.0)
     rabbitmq (>= 2.0.0)
     redisio (>= 1.7.0)
@@ -297,15 +305,9 @@ GRAPH
     chef_handler (>= 0.0.0)
   sudo (2.6.0)
   ulimit (0.3.2)
-  unicorn (1.3.0)
+  unicorn (2.0.0)
   user (0.3.0)
-  windows (1.31.0)
+  windows (1.33.1)
     chef_handler (>= 0.0.0)
   xfs (1.1.0)
-  yum (3.2.2)
-  yum-epel (0.3.6)
-    yum (~> 3.0)
-  yum-erlang_solutions (0.2.0)
-    yum (~> 3.0)
-  yum-mysql-community (0.1.8)
-    yum (>= 3.0.0)
+  yum (2.4.4)