Juju Charms Collection
cassandra package

Merge lp://staging/~ev/charms/precise/cassandra/webops into lp://staging/charms/cassandra

  1. Precise Pangolin (12.04)
  2. webops
  3. Merge into trunk
Proposed by Evan
Status: Merged
Merged at revision: 25
Proposed branch: lp://staging/~ev/charms/precise/cassandra/webops
Merge into: lp://staging/charms/cassandra
Diff against target: 1380 lines (+345/-289)
12 files modified
.bzrignore (+1/-0)
README (+26/-0)
README.storage (+44/-0)
config.yaml (+0/-32)
copyright (+0/-17)
files/check_cassandra_heap.sh (+32/-0)
files/policy-rc.d (+6/-0)
hooks/cassandra-common (+0/-224)
metadata.yaml (+0/-16)
scripts/volume-common.sh (+220/-0)
templates/nrpe_cmd_file.tmpl (+6/-0)
templates/nrpe_service_file.tmpl (+10/-0)
To merge this branch: bzr merge lp://staging/~ev/charms/precise/cassandra/webops
Reviewer Review Type Date Requested Status
Mark Mims (community) Approve
Review via email: mp+174390@code.staging.launchpad.net

Description of the change

This branch pulls in improvements made by the webops team at Canonical.

Unfortunately, bzr didn't believe they shared a common ancestor, so I had to run merge with -r0..-1. If someone has a better approach, I'm all ears.

To post a comment you must log in.
Revision history for this message
Mark Mims (mark-mims) wrote :

Yeah, it's a big merge however we base it. I'll put it in and we can work on some cleanup.

Two requests:

- consider refactoring hooks/cassandra-common to something like $CHARM_DIR/lib/cassandra_tools with accompanying unit-type tests $CHARM_DIR/lib/cassandra_tools/tests

- please get some integration $CHARM_DIR/tests in place next

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: