~chad.smith/charms/precise/block-storage-broker/bsb-use-charmhelpers-to-set-openstack-origin

Viewing all changes in revision 62.

  • Committer: Chad Smith
  • Date: 2014-09-10 21:17:43 UTC
  • mfrom: (54.2.2 trunk)
  • Revision ID: chad.smith@canonical.com-20140910211743-9lgxuwkvwmhm911u
merge block-storage-broker trunk resolve conflicts and fix unit tests to avoid mocker use

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: