~jjo/charms/precise/cassandra/cassandra-merge-from-canonical-is

Viewing all changes in revision 25.

  • Committer: Mark Mims
  • Date: 2013-07-14 19:26:59 UTC
  • mfrom: (24.1.1 cassandra)
  • Revision ID: mark.mims@canonical.com-20130714192659-sk9w6ximj8wo89ih
merging lp:~ev/charms/precise/cassandra/webops as per https://code.launchpad.net/~ev/charms/precise/cassandra/webops/+merge/174390

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: