bigdata-dev team mailing list archive

[Kevin W Monroe <kevin.monroe@xxxxxxxxxxxxx>]

Kevin W Monroe has proposed merging lp:~bigdata-dev/charms/bundles/apache-hadoop-spark-zeppelin/trunk into lp:~charmers/charms/bundles/apache-hadoop-spark-zeppelin/bundle.

Requested reviews:
  Juju Big Data Development (bigdata-dev)
Related bugs:
  Bug #1475632 in Juju Charms Collection: "Bigdata solution - integrated Hadoop, Spark, and zeppelin visualization "
  https://bugs.launchpad.net/charms/+bug/1475632

For more details, see:
https://code.launchpad.net/~bigdata-dev/charms/bundles/apache-hadoop-spark-zeppelin/trunk/+merge/273895

spark charm revno update
-- 
Your team Juju Big Data Development is requested to review the proposed merge of lp:~bigdata-dev/charms/bundles/apache-hadoop-spark-zeppelin/trunk into lp:~charmers/charms/bundles/apache-hadoop-spark-zeppelin/bundle.

=== modified file 'bundle.yaml'
--- bundle.yaml	2015-10-07 22:39:28 +0000
+++ bundle.yaml	2015-10-08 18:19:07 +0000
@@ -26,7 +26,11 @@
       gui-y: "600"
     constraints: mem=7G
   spark:
+<<<<<<< TREE
     charm: cs:trusty/apache-spark-2
+=======
+    charm: cs:trusty/apache-spark-5
+>>>>>>> MERGE-SOURCE
     num_units: 1
     annotations:
       gui-x: "1200"