← Back to branch summary

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

Viewing all changes in revision 33.

  • 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.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: