lp://staging/~corey.bryant/charms/trusty/glance/git

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~openstack-charmers-archive/charms/trusty/glance/next at revision 107

James Page: Needs Fixing on 2015-04-13

Diff: 1485 lines (+849/-152) (has conflicts)

23 files modified

.bzrignore (+1/-0)
Makefile (+4/-2)
README.md (+82/-0)
actions.yaml (+2/-0)
actions/git_reinstall.py (+45/-0)
config.yaml (+16/-0)
hooks/charmhelpers/contrib/openstack/templates/git.upstart (+17/-0)
hooks/charmhelpers/contrib/openstack/templates/section-zeromq (+14/-0)
hooks/charmhelpers/contrib/openstack/utils.py (+126/-60)
hooks/glance_relations.py (+20/-11)
hooks/glance_utils.py (+133/-7)
tests/10-basic-precise-essex (+0/-9)
tests/11-basic-precise-folsom (+0/-11)
tests/12-basic-precise-grizzly (+0/-11)
tests/13-basic-precise-havana (+0/-11)
tests/16-basic-trusty-icehouse-git (+9/-0)
tests/17-basic-trusty-juno (+11/-0)
tests/18-basic-trusty-juno-git (+12/-0)
tests/basic_deployment.py (+27/-4)
unit_tests/__init__.py (+1/-0)
unit_tests/test_actions_git_reinstall.py (+96/-0)
unit_tests/test_glance_relations.py (+92/-18)
unit_tests/test_glance_utils.py (+141/-8)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

113. By Corey Bryant on 2015-04-16

Sync charm-helpers

112. By Corey Bryant on 2015-04-15

Move config_changed into try block

111. By Corey Bryant on 2015-04-15

Sync charm-helpers

110. By Corey Bryant on 2015-04-15

Fixup test_git_reinstall_exception()

109. By Corey Bryant on 2015-04-13

Run config-changed hook after git-reinstall action installs from source

108. By Corey Bryant on 2015-04-13

Turn DEBUG on by default for amulet tests

107. By Corey Bryant on 2015-04-13

Bulk copy files to /etc/glance

106. By Corey Bryant on 2015-04-13

Get http_proxy from AMULET_HTTP_PROXY env var

105. By Corey Bryant on 2015-04-08

Unit test updates for config file template change

104. By Corey Bryant on 2015-04-08

Pass list of config_files to git.upstart template