Skip to content

Commit

Permalink
Fix tests, release 1.2.0
Browse files Browse the repository at this point in the history
- Fix tests looking for older ES version
- Release 1.2.0
  • Loading branch information
martinb3 committed Oct 16, 2015
1 parent b854711 commit 474e9c7
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 3 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@

## [Unreleased](https://github.com/elastic/cookbook-elasticsearch/tree/HEAD)

## [1.2.0](https://github.com/elastic/cookbook-elasticsearch/tree/1.2.0) (2015-10-16)
[Full Changelog](https://github.com/elastic/cookbook-elasticsearch/compare/v1.0.3...1.2.0)

**Closed issues:**

- Compile error w/ 1.0.3 and Chef Server 12 [\#379](https://github.com/elastic/cookbook-elasticsearch/issues/379)
- OS X Support [\#358](https://github.com/elastic/cookbook-elasticsearch/issues/358)
- Dealing with plugin versions that don't match, Elasticsearch failing to start [\#330](https://github.com/elastic/cookbook-elasticsearch/issues/330)
- ruby command not found [\#378](https://github.com/elastic/cookbook-elasticsearch/issues/378)

**Merged pull requests:**

- Update the README to remove a typo [\#381](https://github.com/elastic/cookbook-elasticsearch/pull/381) ([jtwarren](https://github.com/jtwarren))
- Correct the full changelog links [\#375](https://github.com/elastic/cookbook-elasticsearch/pull/375) ([eheydrick](https://github.com/eheydrick))

## [1.0.3](https://github.com/elastic/cookbook-elasticsearch/tree/1.0.3) (2015-09-20)
[Full Changelog](https://github.com/elastic/cookbook-elasticsearch/compare/v1.0.2...v1.0.3)

Expand Down
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
license 'Apache 2.0'
description 'Installs and configures Elasticsearch'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '1.0.3'
version '1.2.0'

depends 'apt'
depends 'yum'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
elasticsearch_plugin 'mobz/elasticsearch-head' do
user 'foo'
group 'bar'
plugin_dir '/usr/local/awesome/elasticsearch-1.7.2/plugins'
plugin_dir '/usr/local/awesome/elasticsearch-1.7.3/plugins'
end

elasticsearch_service 'elasticsearch-crazy' do
Expand Down
2 changes: 1 addition & 1 deletion test/integration/helpers/serverspec/install_examples.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

shared_examples_for 'elasticsearch install' do |args = {}|
dir = args[:dir] || '/usr/local'
version = args[:version] || '1.7.2'
version = args[:version] || '1.7.3'
package_name = args[:package] || false

expected_user = args[:user] || 'elasticsearch'
Expand Down

0 comments on commit 474e9c7

Please sign in to comment.