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: 100
Proposed branch: lp:~bigdata-dev/charms/trusty/apache-hadoop-client/trunk
Merge into: lp:charms/trusty/apache-hadoop-client
Diff against target: 38 lines (+13/-1) (has conflicts)
3 files modified
README.md (+4/-0)
hooks/hadoop-plugin-relation-changed (+7/-1)
hooks/hadoop-plugin-relation-departed (+2/-0)
Text conflict in README.md
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+268666@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Kevin W Monroe (kwmonroe) wrote :

Realtime syslog analytics bundle test looked good. Merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.md'
2--- README.md 2015-06-18 17:04:41 +0000
3+++ README.md 2015-08-20 23:10:29 +0000
4@@ -11,7 +11,11 @@
5 ## Usage
6
7 This charm is intended to be deployed as a part of the
8+<<<<<<< TREE
9 [core bundle](https://jujucharms.com/apache-core-batch-processing/):
10+=======
11+[core bundle](https://jujucharms.com/apache-core-batch-processing):
12+>>>>>>> MERGE-SOURCE
13
14 juju quickstart apache-core-batch-processing
15
16
17=== modified file 'hooks/hadoop-plugin-relation-changed'
18--- hooks/hadoop-plugin-relation-changed 2015-05-11 22:25:12 +0000
19+++ hooks/hadoop-plugin-relation-changed 2015-08-20 23:10:29 +0000
20@@ -1,4 +1,10 @@
21 #!/bin/bash
22-if [[ "$(relation-get hdfs-ready)" == "True" ]]; then
23+hdfs_ready="$(relation-get hdfs-ready)"
24+yarn_ready="$(relation-get yarn-ready)"
25+if [[ "$hdfs_ready" == "true" && "$yarn_ready" == "true" ]]; then
26 hooks/status-set active "Ready to run mapreduce jobs"
27+elif [[ "$hdfs_ready" == "true" ]]; then
28+ hooks/status-set active "Ready (HDFS only)"
29+else
30+ hooks/status-set waiting "Waiting for Hadoop to be ready"
31 fi
32
33=== added file 'hooks/hadoop-plugin-relation-departed'
34--- hooks/hadoop-plugin-relation-departed 1970-01-01 00:00:00 +0000
35+++ hooks/hadoop-plugin-relation-departed 2015-08-20 23:10:29 +0000
36@@ -0,0 +1,2 @@
37+#!/bin/bash
38+hooks/status-set blocked "Please add relation to apache-hadoop-plugin"

Subscribers

People subscribed via source and target branches