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
Reviewer Review Type Date Requested Status
Cory Johns (community) Approve
Review via email: mp+273895@code.qastaging.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
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches