Merge lp:~bigdata-dev/charms/trusty/apache-hadoop-client/trunk into lp:charms/trusty/apache-hadoop-client

Proposed by Kevin W Monroe
Status: Merged
Merged at revision: 101
Proposed branch: lp:~bigdata-dev/charms/trusty/apache-hadoop-client/trunk
Merge into: lp:charms/trusty/apache-hadoop-client
Diff against target: 14 lines (+2/-2)
1 file modified
tests/01-basic-deployment.py (+2/-2)
To merge this branch: bzr merge lp:~bigdata-dev/charms/trusty/apache-hadoop-client/trunk
Reviewer Review Type Date Requested Status
Kevin W Monroe Approve
Review via email: mp+271161@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Kevin W Monroe (kwmonroe) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/01-basic-deployment.py'
--- tests/01-basic-deployment.py 2015-05-11 20:29:38 +0000
+++ tests/01-basic-deployment.py 2015-09-15 17:34:19 +0000
@@ -16,8 +16,8 @@
16 def setUpClass(cls):16 def setUpClass(cls):
17 cls.d = amulet.Deployment(series='trusty')17 cls.d = amulet.Deployment(series='trusty')
18 cls.d.add('apache-hadoop-client')18 cls.d.add('apache-hadoop-client')
19 cls.d.setup(timeout=9000)19 cls.d.setup(timeout=900)
20 cls.d.sentry.wait()20 cls.d.sentry.wait(timeout=1800)
21 cls.unit = cls.d.sentry.unit['apache-hadoop-client/0']21 cls.unit = cls.d.sentry.unit['apache-hadoop-client/0']
2222
23 def test_deploy(self):23 def test_deploy(self):

Subscribers

People subscribed via source and target branches