~adam-collard/charms/trusty/swift-storage/conditional-service-restart-stable

Viewing all changes in revision 72.

  • Committer: Adam Collard
  • Date: 2015-09-03 10:25:07 UTC
  • Revision ID: adam.collard@canonical.com-20150903102507-5tiq7ezbyrc3du5h
Merge r79 from next, fix conflict

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: