Merge lp:~bigdata-dev/charms/bundles/realtime-syslog-analytics/bundle into lp:~charmers/charms/bundles/realtime-syslog-analytics/bundle

Proposed by Kevin W Monroe on 2015-12-15
Status: Merged
Merged at revision: 12
Proposed branch: lp:~bigdata-dev/charms/bundles/realtime-syslog-analytics/bundle
Merge into: lp:~charmers/charms/bundles/realtime-syslog-analytics/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/realtime-syslog-analytics/bundle
Reviewer Review Type Date Requested Status
Cory Johns 2015-12-15 Approve on 2015-12-15
Review via email: mp+280636@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.
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-09-18 18:59:05 +0000
3+++ bundle-dev.yaml 2015-12-15 20:17:19 +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 flume-hdfs:
11 charm: cs:~bigdata-dev/trusty/apache-flume-hdfs
12 num_units: 1
13
14=== modified file 'bundle-local.yaml'
15--- bundle-local.yaml 2015-09-18 18:59:05 +0000
16+++ bundle-local.yaml 2015-12-15 20:17:19 +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 flume-hdfs:
24 charm: apache-flume-hdfs
25 num_units: 1
26
27=== modified file 'bundle.yaml'
28--- bundle.yaml 2015-10-21 14:51:00 +0000
29+++ bundle.yaml 2015-12-15 20:17:19 +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 flume-hdfs:
37 charm: cs:trusty/apache-flume-hdfs-4
38 num_units: 1
39@@ -26,7 +26,7 @@
40 gui-y: "350"
41 constraints: mem=7G
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