lp://qastaging/~corey.bryant/charms/trusty/neutron-api/git

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next at revision 102

Ryan Beisner (community): Needs Fixing on 2015-04-07

OpenStack Charmers: Pending requested 2015-04-01

Diff: 1046 lines (+676/-32) (has conflicts)

20 files modified

.bzrignore (+1/-0)
Makefile (+3/-2)
README.md (+87/-0)
actions.yaml (+2/-0)
actions/git_reinstall.py (+45/-0)
config.yaml (+16/-0)
hooks/charmhelpers/contrib/openstack/utils.py (+18/-6)
hooks/neutron_api_hooks.py (+13/-2)
hooks/neutron_api_utils.py (+114/-1)
templates/git/neutron_sudoers (+4/-0)
templates/git/upstart/neutron-server.upstart (+22/-0)
tests/16-basic-trusty-icehouse-git (+9/-0)
tests/16-basic-trusty-juno (+0/-11)
tests/17-basic-trusty-juno (+11/-0)
tests/18-basic-trusty-juno-git (+12/-0)
tests/basic_deployment.py (+29/-4)
unit_tests/__init__.py (+2/-0)
unit_tests/test_actions_git_reinstall.py (+105/-0)
unit_tests/test_neutron_api_hooks.py (+87/-2)
unit_tests/test_neutron_api_utils.py (+96/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

98. By Corey Bryant on 2015-04-16

Sync charm-helpers

97. By Corey Bryant on 2015-04-15

Move config_changed into try block

96. By Corey Bryant on 2015-04-15

Sync charm-helpers

95. By Corey Bryant on 2015-04-15

Merge next branch

94. By Corey Bryant on 2015-04-15

Fixup test_git_reinstall_exception()

93. By Corey Bryant on 2015-04-14

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

92. By Corey Bryant on 2015-04-13

Turn DEBUG on by default for amulet tests

91. By Corey Bryant on 2015-04-13

Bulk copy files to /etc/neutron

90. By Corey Bryant on 2015-04-13

Move deploy from source template files to templates/git

89. By Corey Bryant on 2015-04-13

Get http_proxy from AMULET_HTTP_PROXY env var