Merge lp://qastaging/~bigdata-dev/charms/bundles/apache-hadoop-spark-zeppelin/trunk into lp://qastaging/~charmers/charms/bundles/apache-hadoop-spark-zeppelin/bundle
Proposed by
Kevin W Monroe
Status: | Merged |
---|---|
Merged at revision: | 9 |
Proposed branch: | lp://qastaging/~bigdata-dev/charms/bundles/apache-hadoop-spark-zeppelin/trunk |
Merge into: | lp://qastaging/~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://qastaging/~bigdata-dev/charms/bundles/apache-hadoop-spark-zeppelin/trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Cory Johns (community) | Approve | ||
Review via email:
|
Description of the change
spark charm revno update
To post a comment you must log in.
Not sure why this had a merge conflict, but +1 on bumping to rev 5.