~michael.nelson/charms/trusty/elasticsearch/merge-elasticsearch2-branch

Viewing all changes in revision 42.

  • Committer: Christopher Glass
  • Date: 2016-03-10 16:07:56 UTC
  • mfrom: (41.1.1 store-es)
  • Revision ID: christopher.glass@canonical.com-20160310160756-2fxqy6x3sm39br54
Merge lp:~lazypower/charms/trusty/elasticsearch/20-bump [r=tribaal] [a=lazypower]

Bump in config, and templating for ES 2.x.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: