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: | 11 |
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: |
47 lines (+4/-4) 3 files modified
bundle-dev.yaml (+1/-1) bundle-local.yaml (+1/-1) bundle.yaml (+2/-2) |
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
Bump plugin revno to pin charm-benchmark. Newer charm-benchmark updates charmhelpers to a version that is incompatible with the plugin's CH fork. Also bumping slave constraint to match masters.
To post a comment you must log in.
+1