Skip to content

Commit

Permalink
Unpin some dependencies
Browse files Browse the repository at this point in the history
- Unpin cron now that upstream is fixed, closes #161
- Unpin elasticsearch now that a final 0.3.x release has been made
- Reverting #160 until we can do more proper testing
  • Loading branch information
martinb3 committed Jul 16, 2015
1 parent 4d9ca62 commit a3163a1
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ platforms:
- name: ubuntu-12.04
run_list:
- recipe[apt]
- name: centos-6
- name: centos-6.6
run_list:
- recipe[yum]

Expand Down
3 changes: 0 additions & 3 deletions Berksfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ metadata

cookbook 'java'

# until https://github.com/elastic/cookbook-elasticsearch/pull/230
cookbook 'elasticsearch', '~> 0.3', git:'git@github.com:racker/cookbook-elasticsearch.git'

group :integration do
cookbook 'wrapper', path: 'test/fixtures/cookbooks/wrapper'
cookbook 'apt'
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ group :kitchen_common do
end

group :kitchen_vagrant do
gem 'kitchen-vagrant'
gem 'kitchen-vagrant', '< 0.17.0'
gem 'vagrant-wrapper'
end

Expand Down
4 changes: 2 additions & 2 deletions metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
depends 'apt'
depends 'build-essential'
depends 'chef-sugar'
depends 'cron', '~> 1.4.3'
depends 'elasticsearch', '~> 0.3'
depends 'cron'
depends 'elasticsearch', '~> 0.3.14' # 1.0 release is a radical change, needs work
depends 'firewall'
depends 'htpasswd'
depends 'kibana_lwrp'
Expand Down

0 comments on commit a3163a1

Please sign in to comment.