Juju Charms Collection
apache-hadoop-spark-zeppelin package

Merge lp:~bigdata-dev/charms/bundles/apache-hadoop-spark-zeppelin/trunk into lp:~charmers/charms/bundles/apache-hadoop-spark-zeppelin/bundle

  1. Charm Bundles (0.0)
  2. trunk
  3. Merge into bundle
Proposed by Kevin W Monroe
Status: Merged
Merged at revision: 9
Proposed branch: lp:~bigdata-dev/charms/bundles/apache-hadoop-spark-zeppelin/trunk
Merge into: lp:~charmers/charms/bundles/apache-hadoop-spark-zeppelin/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/apache-hadoop-spark-zeppelin/trunk
Reviewer Review Type Date Requested Status
Cory Johns (community) Approve
Review via email: mp+273895@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
1=== modified file 'bundle.yaml'
2--- bundle.yaml 2015-10-07 22:39:28 +0000
3+++ bundle.yaml 2015-10-08 18:19:07 +0000
4@@ -26,7 +26,11 @@
5 gui-y: "600"
6 constraints: mem=7G
7 spark:
8+<<<<<<< TREE
9 charm: cs:trusty/apache-spark-2
10+=======
11+ charm: cs:trusty/apache-spark-5
12+>>>>>>> MERGE-SOURCE
13 num_units: 1
14 annotations:
15 gui-x: "1200"

Subscribers

People subscribed via source and target branches