bigdata-dev team mailing list archive
-
bigdata-dev team
-
Mailing list archive
-
Message #00402
[Merge] lp:~bigdata-dev/charms/bundles/realtime-syslog-analytics/bundle into lp:~charmers/charms/bundles/realtime-syslog-analytics/bundle
Kevin W Monroe has proposed merging lp:~bigdata-dev/charms/bundles/realtime-syslog-analytics/bundle into lp:~charmers/charms/bundles/realtime-syslog-analytics/bundle.
Requested reviews:
Juju Big Data Development (bigdata-dev)
Related bugs:
Bug #1498589 in Juju Charms Collection: "new bundle: realtime syslog analytics"
https://bugs.launchpad.net/charms/+bug/1498589
For more details, see:
https://code.launchpad.net/~bigdata-dev/charms/bundles/realtime-syslog-analytics/bundle/+merge/273896
spark charm revno update
--
Your team Juju Big Data Development is requested to review the proposed merge of lp:~bigdata-dev/charms/bundles/realtime-syslog-analytics/bundle into lp:~charmers/charms/bundles/realtime-syslog-analytics/bundle.
=== modified file 'bundle.yaml'
--- bundle.yaml 2015-10-07 22:36:46 +0000
+++ bundle.yaml 2015-10-08 18:19:21 +0000
@@ -43,7 +43,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"
Follow ups