Juju Charms Collection
hdp-zookeeper package

Merge lp:~bigdata-dev/charms/trusty/hdp-zookeeper/cs-jps-quickfix into lp:charms/trusty/hdp-zookeeper

  1. Trusty Tahr (14.04)
  2. cs-jps-quickfix
  3. Merge into trunk
Proposed by Cory Johns
Status: Merged
Merged at revision: 22
Proposed branch: lp:~bigdata-dev/charms/trusty/hdp-zookeeper/cs-jps-quickfix
Merge into: lp:charms/trusty/hdp-zookeeper
Diff against target: 11 lines (+1/-1)
1 file modified
tests/10-deploy (+1/-1)
To merge this branch: bzr merge lp:~bigdata-dev/charms/trusty/hdp-zookeeper/cs-jps-quickfix
Reviewer Review Type Date Requested Status
Matt Bruzek (community) Approve
amir sanjar (community) Approve
Review via email: mp+250936@code.launchpad.net

Description of the change

Work around the upstream JPS issue (https://bugs.launchpad.net/ubuntu/+source/openjdk-6/+bug/1417962)

To post a comment you must log in.
Revision history for this message
amir sanjar (asanjar) :
review: Approve
Revision history for this message
Matt Bruzek (mbruzek) wrote :

+1 LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/10-deploy'
2--- tests/10-deploy 2014-12-02 05:42:43 +0000
3+++ tests/10-deploy 2015-02-25 14:50:05 +0000
4@@ -30,7 +30,7 @@
5
6
7 def test_zookeeper_service_status(self):
8- o,c= self.zk_unit.run("jps | awk '{print $2}'")
9+ o,c= self.zk_unit.run("pgrep -a java")
10 if o.find('QuorumPeerMain') == -1:
11 amulet.raise_status(amulet.FAIL, msg="Zookeeper QuorumPeerMain not started")
12

Subscribers

People subscribed via source and target branches