lp:~corey.bryant/charms/trusty/openstack-dashboard/git

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers-archive/charms/trusty/openstack-dashboard/next at revision 60

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

OpenStack Charmers: Pending requested 2015-04-06

Diff: 1580 lines (+1042/-121) (has conflicts)

25 files modified

.bzrignore (+1/-0)
Makefile (+4/-3)
README.md (+151/-0)
actions.yaml (+2/-0)
actions/git_reinstall.py (+45/-0)
charm-helpers-hooks.yaml (+13/-0)
charm-helpers.yaml (+0/-13)
config.yaml (+16/-0)
hooks/charmhelpers/contrib/openstack/templates/git.upstart (+17/-0)
hooks/charmhelpers/contrib/openstack/templates/section-keystone-authtoken (+9/-0)
hooks/charmhelpers/contrib/openstack/templates/section-rabbitmq-oslo (+22/-0)
hooks/charmhelpers/contrib/openstack/templates/section-zeromq (+14/-0)
hooks/charmhelpers/contrib/openstack/utils.py (+126/-60)
hooks/horizon_hooks.py (+21/-5)
hooks/horizon_utils.py (+189/-12)
templates/git/dashboard.conf (+8/-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 (+25/-3)
unit_tests/__init__.py (+2/-0)
unit_tests/test_actions_git_reinstall.py (+96/-0)
unit_tests/test_horizon_hooks.py (+74/-7)
unit_tests/test_horizon_utils.py (+175/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

67. By Corey Bryant on 2015-04-16

Sync charm-helpers

66. By Corey Bryant on 2015-04-15

Bump time wait in service restart amulet test

65. By Corey Bryant on 2015-04-15

Move config_changed into try block

64. By Corey Bryant on 2015-04-15

Sync charm-helpers

63. By Corey Bryant on 2015-04-15

Fixup test_git_reinstall_exception()

62. By Corey Bryant on 2015-04-13

Turn DEBUG on by default for amulet tests

61. By Corey Bryant on 2015-04-13

Drop Ubuntu theme from deploy from source

60. By Corey Bryant on 2015-04-13

Merge next branch

59. By Corey Bryant on 2015-04-13

Move deploy from source template files to templates/git

58. By Corey Bryant on 2015-04-13

Get http_proxy from AMULET_HTTP_PROXY env var