Juju Charms Collection
apache-analytics-sql package

Merge lp:~bigdata-dev/charms/bundles/apache-analytics-sql/trunk into lp:~charmers/charms/bundles/apache-analytics-sql/bundle

  1. Charm Bundles (0.0)
  2. trunk
  3. Merge into bundle
Proposed by Kevin W Monroe
Status: Merged
Merged at revision: 17
Proposed branch: lp:~bigdata-dev/charms/bundles/apache-analytics-sql/trunk
Merge into: lp:~charmers/charms/bundles/apache-analytics-sql/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-analytics-sql/trunk
Reviewer Review Type Date Requested Status
Cory Johns (community) Approve
Review via email: mp+280638@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. Also bumping slave constraint to match masters.

To post a comment you must log in.
Revision history for this message
Cory Johns (johnsca) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bundle-dev.yaml'
2--- bundle-dev.yaml 2015-10-07 17:15:28 +0000
3+++ bundle-dev.yaml 2015-12-15 20:17:45 +0000
4@@ -5,7 +5,7 @@
5 annotations:
6 gui-x: "300"
7 gui-y: "200"
8- constraints: mem=3G
9+ constraints: mem=7G
10 hdfs-master:
11 charm: cs:~bigdata-dev/trusty/apache-hadoop-hdfs-master
12 num_units: 1
13
14=== modified file 'bundle-local.yaml'
15--- bundle-local.yaml 2015-09-17 20:31:00 +0000
16+++ bundle-local.yaml 2015-12-15 20:17:45 +0000
17@@ -5,7 +5,7 @@
18 annotations:
19 gui-x: "300"
20 gui-y: "200"
21- constraints: mem=3G
22+ constraints: mem=7G
23 hdfs-master:
24 charm: apache-hadoop-hdfs-master
25 num_units: 1
26
27=== modified file 'bundle.yaml'
28--- bundle.yaml 2015-10-07 21:29:38 +0000
29+++ bundle.yaml 2015-12-15 20:17:45 +0000
30@@ -5,7 +5,7 @@
31 annotations:
32 gui-x: "300"
33 gui-y: "200"
34- constraints: mem=3G
35+ constraints: mem=7G
36 hdfs-master:
37 charm: cs:trusty/apache-hadoop-hdfs-master-9
38 num_units: 1
39@@ -29,7 +29,7 @@
40 gui-x: "1200"
41 gui-y: "450"
42 plugin:
43- charm: cs:trusty/apache-hadoop-plugin-8
44+ charm: cs:trusty/apache-hadoop-plugin-9
45 annotations:
46 gui-x: "900"
47 gui-y: "200"

Subscribers

People subscribed via source and target branches