Merge lp:~aisrael/charms/trusty/cassandra-stress/charms.benchmark into lp:~marcoceppi/charms/trusty/cassandra-stress/trunk

Proposed by Adam Israel
Status: Merged
Merged at revision: 11
Proposed branch: lp:~aisrael/charms/trusty/cassandra-stress/charms.benchmark
Merge into: lp:~marcoceppi/charms/trusty/cassandra-stress/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
hooks/install (+1/-1)
To merge this branch: bzr merge lp:~aisrael/charms/trusty/cassandra-stress/charms.benchmark
Reviewer Review Type Date Requested Status
Marco Ceppi Approve
Review via email: mp+279007@code.launchpad.net

Description of the change

Update to use charms.benchmark instead of charm-benchmark

To post a comment you must log in.
Revision history for this message
Marco Ceppi (marcoceppi) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/install'
2--- hooks/install 2015-08-27 05:24:55 +0000
3+++ hooks/install 2015-11-30 17:31:47 +0000
4@@ -16,7 +16,7 @@
5 apt-get install -y cassandra
6
7 apt-get install -y python-pip
8-pip install charm-benchmark
9+pip install charms.benchmark
10
11 if [ -z "$(relation-ids database)" ]; then
12 status-set blocked "Relate me to a cassandra cluster to continue"

Subscribers

People subscribed via source and target branches

to all changes: