Merge lp:~bigdata-dev/charms/bundles/realtime-syslog-analytics/bundle into lp:~charmers/charms/bundles/realtime-syslog-analytics/bundle

Proposed by Kevin W Monroe
Status: Merged
Merged at revision: 10
Proposed branch: lp:~bigdata-dev/charms/bundles/realtime-syslog-analytics/bundle
Merge into: lp:~charmers/charms/bundles/realtime-syslog-analytics/bundle
Diff against target: 15 lines (+4/-0) (has conflicts)
1 file modified
bundle.yaml (+4/-0)
Text conflict in bundle.yaml
To merge this branch: bzr merge lp:~bigdata-dev/charms/bundles/realtime-syslog-analytics/bundle
Reviewer Review Type Date Requested Status
Cory Johns Approve
Review via email: mp+273896@code.launchpad.net

Description of the change

spark charm revno update

To post a comment you must log in.
Revision history for this message
Cory Johns (johnsca) wrote :

Not sure why this had a merge conflict, but +1 on bumping to rev 5.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
43 gui-y: "600"43 gui-y: "600"
44 constraints: mem=7G44 constraints: mem=7G
45 spark:45 spark:
46<<<<<<< TREE
46 charm: cs:trusty/apache-spark-247 charm: cs:trusty/apache-spark-2
48=======
49 charm: cs:trusty/apache-spark-5
50>>>>>>> MERGE-SOURCE
47 num_units: 151 num_units: 1
48 annotations:52 annotations:
49 gui-x: "1200"53 gui-x: "1200"

Subscribers

People subscribed via source and target branches