~gandelman-a/charms/precise/glance/merge_resolve_conflicts

  • Committer: Adam Gandelman
  • Date: 2013-06-03 18:39:29 UTC
  • mfrom: (29.2.23 glance)
  • Revision ID: adamg@canonical.com-20130603183929-498whibndp6u2o4m
Resolve conflicts, merge Grizzly + HA work.
Filename Latest Rev Last Changed Committer Comment Size
..
hooks 1 12 years ago Adam Gandelman initial commit Diff
scripts 29.4.1 11 years ago Jerry Seutter Adding health scripts to glance charm. Diff
config.yaml 29.5.1 11 years ago Adam Gandelman Checkin https reconfigure work. 1.9 KB Diff Download File
copyright 20.1.3 11 years ago Adam Gandelman Set sql_connection in glance-api.conf. Add copyrig 756 bytes Diff Download File
metadata.yaml 29.2.1 11 years ago James Page Initial updates for HA 723 bytes Diff Download File
revision 33 10 years ago Adam Gandelman Resolve conflicts, merge Grizzly + HA work. 4 bytes Diff Download File