Juju Charms Collection
apache-core-batch-processing package

Merge lp:~bigdata-dev/charms/bundles/apache-core-batch-processing/trunk into lp:~charmers/charms/bundles/apache-core-batch-processing/bundle

  1. Charm Bundles (0.0)
  2. trunk
  3. Merge into bundle
Proposed by Kevin W Monroe
Status: Merged
Merged at revision: 21
Proposed branch: lp:~bigdata-dev/charms/bundles/apache-core-batch-processing/trunk
Merge into: lp:~charmers/charms/bundles/apache-core-batch-processing/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:~bigdata-dev/charms/bundles/apache-core-batch-processing/trunk
Reviewer Review Type Date Requested Status
Kevin W Monroe Approve
Review via email: mp+280619@code.launchpad.net

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.

To post a comment you must log in.
Revision history for this message
Kevin W Monroe (kwmonroe) wrote :

merged

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bundle-dev.yaml'
--- bundle-dev.yaml 2015-09-16 20:19:24 +0000
+++ bundle-dev.yaml 2015-12-15 16:52:55 +0000
@@ -11,7 +11,7 @@
11 annotations:11 annotations:
12 gui-x: "250"12 gui-x: "250"
13 gui-y: "200"13 gui-y: "200"
14 constraints: mem=3G14 constraints: mem=7G
15 hdfs-master:15 hdfs-master:
16 charm: cs:~bigdata-dev/trusty/apache-hadoop-hdfs-master16 charm: cs:~bigdata-dev/trusty/apache-hadoop-hdfs-master
17 num_units: 117 num_units: 1
1818
=== modified file 'bundle-local.yaml'
--- bundle-local.yaml 2015-09-16 20:19:24 +0000
+++ bundle-local.yaml 2015-12-15 16:52:55 +0000
@@ -11,7 +11,7 @@
11 annotations:11 annotations:
12 gui-x: "250"12 gui-x: "250"
13 gui-y: "200"13 gui-y: "200"
14 constraints: mem=3G14 constraints: mem=7G
15 hdfs-master:15 hdfs-master:
16 charm: local:trusty/apache-hadoop-hdfs-master16 charm: local:trusty/apache-hadoop-hdfs-master
17 num_units: 117 num_units: 1
1818
=== modified file 'bundle.yaml'
--- bundle.yaml 2015-10-07 21:00:45 +0000
+++ bundle.yaml 2015-12-15 16:52:55 +0000
@@ -11,7 +11,7 @@
11 annotations:11 annotations:
12 gui-x: "250"12 gui-x: "250"
13 gui-y: "200"13 gui-y: "200"
14 constraints: mem=3G14 constraints: mem=7G
15 hdfs-master:15 hdfs-master:
16 charm: cs:trusty/apache-hadoop-hdfs-master-916 charm: cs:trusty/apache-hadoop-hdfs-master-9
17 num_units: 117 num_units: 1
@@ -20,7 +20,7 @@
20 gui-y: "350"20 gui-y: "350"
21 constraints: mem=7G21 constraints: mem=7G
22 plugin:22 plugin:
23 charm: cs:trusty/apache-hadoop-plugin-823 charm: cs:trusty/apache-hadoop-plugin-9
24 annotations:24 annotations:
25 gui-x: "950"25 gui-x: "950"
26 gui-y: "200"26 gui-y: "200"

Subscribers

People subscribed via source and target branches