lp:~stub/charm-helpers/integration

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:charm-helpers at revision 371

Liam Young (community): Approve on 2015-05-08

Diff: 423 lines (+120/-37)

11 files modified

charmhelpers/contrib/peerstorage/__init__.py (+2/-0)
charmhelpers/contrib/unison/__init__.py (+5/-4)
charmhelpers/core/hookenv.py (+18/-4)
charmhelpers/core/host.py (+1/-1)
charmhelpers/core/services/base.py (+2/-2)
charmhelpers/fetch/__init__.py (+1/-1)
tests/contrib/peerstorage/test_peerstorage.py (+8/-0)
tests/contrib/unison/test_unison.py (+7/-5)
tests/core/test_hookenv.py (+51/-5)
tests/core/test_services.py (+12/-0)
tests/core/test_templating.py (+13/-15)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

254. By Stuart Bishop on 2017-08-30

Merge charmhelpers 0.18.1

253. By Stuart Bishop on 2017-02-22

Hack to work around Bug #1513466

252. By Stuart Bishop on 2017-02-21

Merge trunk

251. By Stuart Bishop on 2016-03-17

Merge Bug #1557769 fix

250. By Stuart Bishop on 2016-03-17

Merge trunk

249. By Stuart Bishop on 2015-10-26

Merge trunk

248. By Stuart Bishop on 2015-07-28

Merge bug-1478940-dont-reset-directory-perms

247. By Stuart Bishop on 2015-07-28

merge meminfo

246. By Stuart Bishop on 2015-07-27

Merge context

245. By Stuart Bishop on 2015-07-27

Merge meminfo