Merge lp://staging/~justin-fathomdb/charms/precise/elasticsearch/update-version into lp://staging/~charmers/charms/precise/elasticsearch/trunk
Proposed by
justinsb
| Status: | Merged |
|---|---|
| Merged at revision: | 29 |
| Proposed branch: | lp://staging/~justin-fathomdb/charms/precise/elasticsearch/update-version |
| Merge into: | lp://staging/~charmers/charms/precise/elasticsearch/trunk |
| Diff against target: |
202 lines (+59/-32) 6 files modified
config.yaml (+2/-2) files/charm/services/elasticsearch.conf (+25/-0) hooks/common.sh (+2/-1) hooks/install (+17/-24) hooks/start (+8/-3) hooks/stop (+5/-2) |
| To merge this branch: | bzr merge lp://staging/~justin-fathomdb/charms/precise/elasticsearch/update-version |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Charles Butler (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Update to elasticsearch 1.1.0
Also replace the Java service wrapper with Upstart.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Justin,
Thank you for this submitted merge proposal.
I like that you're removed the java service wrapper and placed management of the service under upstart. This is a welcome addition plus the latest version upgrade.
The included amulet tests pass, while basic, provided a quick path to validation.
I'm approving this merge. +1 LGTM
Thanks again!