Cory Johns has proposed merging
lp:~bigdata-dev/charms/bundles/hdp-core-batch-processing/cs-jps-quickfix into
lp:~charmers/charms/bundles/hdp-core-batch-processing/bundle.
Requested reviews:
charmers (charmers)
For more details, see:
https://code.launchpad.net/~bigdata-dev/charms/bundles/hdp-core-batch-processing/cs-jps-quickfix/+merge/250991
Updated hdp-hadoop to newest version with fix for upstream jps issue
--
Your team Juju Big Data Development is subscribed to branch
lp:~bigdata-dev/charms/bundles/hdp-core-batch-processing/cs-jps-quickfix.
=== modified file 'bundles.yaml'
--- bundles.yaml 2014-11-24 21:35:43 +0000
+++ bundles.yaml 2015-02-25 20:46:46 +0000
@@ -1,18 +1,30 @@
+<<<<<<< TREE
hadoop-core-batch-processing:
services:
"compute-node":
charm: "cs:trusty/hdp-hadoop-7"
+=======
+hadoop-core-batch-processing:
+ services:
+ "compute-node":
+ charm: "cs:trusty/hdp-hadoop-8"
+>>>>>>> MERGE-SOURCE
num_units: 1
- annotations:
+ annotations:
"gui-x": "469.7364694747354"
"gui-y": "681.997714796476"
+<<<<<<< TREE
"yarn-hdfs-master":
charm: "cs:trusty/hdp-hadoop-7"
+=======
+ "yarn-hdfs-master":
+ charm: "cs:trusty/hdp-hadoop-8"
+>>>>>>> MERGE-SOURCE
num_units: 1
- annotations:
+ annotations:
"gui-x": "467.5"
"gui-y": "277.0022852035241"
- relations:
+ relations:
- - "yarn-hdfs-master:namenode"
- "compute-node:datanode"
- - "yarn-hdfs-master:resourcemanager"
--
Mailing list: https://launchpad.net/~bigdata-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~bigdata-dev
More help : https://help.launchpad.net/ListHelp
