Juju Charms Collection
openstack-dashboard package

Merge lp:~james-page/charms/precise/openstack-dashboard/grizzly-upgrade into lp:~openstack-charmers/charms/precise/openstack-dashboard/ha-support

  1. Precise Pangolin (12.04)
  2. grizzly-upgrade
  3. Merge into ha-support
Proposed by James Page
Status: Merged
Merged at revision: 35
Proposed branch: lp:~james-page/charms/precise/openstack-dashboard/grizzly-upgrade
Merge into: lp:~openstack-charmers/charms/precise/openstack-dashboard/ha-support
Diff against target: 19 lines (+2/-2)
2 files modified
hooks/horizon-common (+1/-1)
revision (+1/-1)
To merge this branch: bzr merge lp:~james-page/charms/precise/openstack-dashboard/grizzly-upgrade
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+165053@code.launchpad.net

Description of the change

Fixup upgrades to grizzly

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/horizon-common'
2--- hooks/horizon-common 2013-04-26 20:22:52 +0000
3+++ hooks/horizon-common 2013-05-22 10:17:39 +0000
4@@ -3,7 +3,7 @@
5
6 CHARM="openstack-dashboard"
7
8-PACKAGES="openstack-dashboard python-keystoneclient python-memcache memcached haproxy"
9+PACKAGES="openstack-dashboard python-keystoneclient python-memcache memcached haproxy python-novaclient"
10 LOCAL_SETTINGS="/etc/openstack-dashboard/local_settings.py"
11 HOOKS_DIR="$CHARM_DIR/hooks"
12
13
14=== modified file 'revision'
15--- revision 2013-04-26 20:46:17 +0000
16+++ revision 2013-05-22 10:17:39 +0000
17@@ -1,1 +1,1 @@
18-28
19+30

Subscribers

People subscribed via source and target branches