Merge lp:~michael.nelson/charms/trusty/elasticsearch/update-readme into lp:~charmers/charms/trusty/elasticsearch/trunk
Proposed by
Michael Nelson
Status: | Merged |
---|---|
Merged at revision: | 31 |
Proposed branch: | lp:~michael.nelson/charms/trusty/elasticsearch/update-readme |
Merge into: | lp:~charmers/charms/trusty/elasticsearch/trunk |
Diff against target: |
201 lines (+58/-54) 6 files modified
HACKING.md (+17/-0) Makefile (+6/-5) README.md (+33/-26) config.yaml (+1/-7) hooks/hooks.py (+1/-2) unit_tests/test_hooks.py (+0/-14) |
To merge this branch: | bzr merge lp:~michael.nelson/charms/trusty/elasticsearch/update-readme |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Charles Butler (community) | Approve | ||
Review via email: mp+225802@code.launchpad.net |
Commit message
Fix issues in readme, update default to elasticsearch 1.2.
Description of the change
* Simplify and correct README.
* Edit out local deployment info into a separate HACKING.md.
* Remove the install-
only and a suitable version of ansible is in trusty.
* Update the default repo to the 1.2 elasticsearch repo.
To post a comment you must log in.
+1 LGTM