diff --git a/Berksfile b/Berksfile index 26388bd..a2616b9 100644 --- a/Berksfile +++ b/Berksfile @@ -51,4 +51,4 @@ cookbook 'homebrew', '= 3.0.0' cookbook 'mariadb', '= 0.3.1' cookbook 'ipfs', git: 'https://github.com/67P/ipfs-cookbook.git', - ref: 'feature/reduce_memory_usage' + ref: 'master' diff --git a/Berksfile.lock b/Berksfile.lock index 432f8cf..75424cd 100644 --- a/Berksfile.lock +++ b/Berksfile.lock @@ -1,9 +1,9 @@ DEPENDENCIES apache2 (= 3.3.0) - application (= 5.2.0) + application (~> 5.2.0) application_git (= 1.1.0) - application_javascript (= 1.0.0) - application_ruby (= 4.1.0) + application_javascript (~> 1.0.0) + application_ruby (~> 4.1.0) apt (~> 7.0.0) ark (= 3.1.0) build-essential (~> 8.2.1) @@ -18,8 +18,8 @@ DEPENDENCIES hostsfile (= 2.4.5) ipfs git: https://github.com/67P/ipfs-cookbook.git - revision: 5aa50ecc7eca5c7f113492057ca3bc8158e5154c - ref: feature + revision: 3d4e9cceeaf89d30ca1b063e26a51905e8ddfd6b + ref: master logrotate (= 2.2.0) mariadb (= 0.3.1) mediawiki @@ -32,7 +32,7 @@ DEPENDENCIES ntp (= 3.4.0) ohai (~> 5.2.5) openssl (~> 8.5.5) - php (= 6.1.1) + php (~> 6.1.1) php-fpm (~> 0.8.0) poise (~> 2.8.2) poise-archive (~> 1.5.0) @@ -40,9 +40,9 @@ DEPENDENCIES git: https://github.com/67p/poise-javascript.git revision: d85078fe59bd4f16d05a9ffe6e0fc449015e4440 ref: d85078f - poise-languages (= 2.1.1) + poise-languages (~> 2.1.1) poise-ruby (~> 2.4.0) - poise-ruby-build (= 1.1.0) + poise-ruby-build (~> 1.1.0) poise-service (~> 1.5.2) postfix (= 5.0.2) postgresql (= 7.1.4) @@ -89,7 +89,7 @@ GRAPH php (>= 0.0.0) windows (>= 0.0.0) dmg (4.1.1) - firewall (2.6.3) + firewall (2.6.5) chef-sugar (>= 0.0.0) git (6.0.0) build-essential (>= 0.0.0) @@ -99,7 +99,7 @@ GRAPH hostname (0.4.2) hostsfile (>= 0.0.0) hostsfile (2.4.5) - ipfs (0.1.3) + ipfs (0.3.0) ark (>= 0.0.0) logrotate (2.2.0) mariadb (0.3.1) @@ -139,7 +139,7 @@ GRAPH poise-javascript (1.2.1) poise (~> 2.0) poise-languages (~> 2.0) - poise-languages (2.1.1) + poise-languages (2.1.2) poise (~> 2.5) poise-archive (~> 1.0) poise-ruby (2.4.0) @@ -156,10 +156,10 @@ GRAPH postgresql (7.1.4) redis (0.5.6) apt (>= 0.0.0) - seven_zip (2.0.2) - windows (>= 1.2.2) + seven_zip (3.1.1) + windows (>= 0.0.0) timezone_iii (1.0.4) users (5.3.1) - windows (5.3.0) + windows (6.0.0) yum (5.1.0) yum-epel (3.3.0)