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

Proposed by Kevin W Monroe
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 Approve
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.
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
=== modified file 'bundle-dev.yaml'
--- bundle-dev.yaml 2015-09-18 18:59:05 +0000
+++ bundle-dev.yaml 2015-12-15 20:17:19 +0000
@@ -5,7 +5,7 @@
5 annotations:5 annotations:
6 gui-x: "300"6 gui-x: "300"
7 gui-y: "200"7 gui-y: "200"
8 constraints: mem=3G8 constraints: mem=7G
9 flume-hdfs:9 flume-hdfs:
10 charm: cs:~bigdata-dev/trusty/apache-flume-hdfs10 charm: cs:~bigdata-dev/trusty/apache-flume-hdfs
11 num_units: 111 num_units: 1
1212
=== modified file 'bundle-local.yaml'
--- bundle-local.yaml 2015-09-18 18:59:05 +0000
+++ bundle-local.yaml 2015-12-15 20:17:19 +0000
@@ -5,7 +5,7 @@
5 annotations:5 annotations:
6 gui-x: "300"6 gui-x: "300"
7 gui-y: "200"7 gui-y: "200"
8 constraints: mem=3G8 constraints: mem=7G
9 flume-hdfs:9 flume-hdfs:
10 charm: apache-flume-hdfs10 charm: apache-flume-hdfs
11 num_units: 111 num_units: 1
1212
=== modified file 'bundle.yaml'
--- bundle.yaml 2015-10-21 14:51:00 +0000
+++ bundle.yaml 2015-12-15 20:17:19 +0000
@@ -5,7 +5,7 @@
5 annotations:5 annotations:
6 gui-x: "300"6 gui-x: "300"
7 gui-y: "200"7 gui-y: "200"
8 constraints: mem=3G8 constraints: mem=7G
9 flume-hdfs:9 flume-hdfs:
10 charm: cs:trusty/apache-flume-hdfs-410 charm: cs:trusty/apache-flume-hdfs-4
11 num_units: 111 num_units: 1
@@ -26,7 +26,7 @@
26 gui-y: "350"26 gui-y: "350"
27 constraints: mem=7G27 constraints: mem=7G
28 plugin:28 plugin:
29 charm: cs:trusty/apache-hadoop-plugin-829 charm: cs:trusty/apache-hadoop-plugin-9
30 annotations:30 annotations:
31 gui-x: "900"31 gui-x: "900"
32 gui-y: "200"32 gui-y: "200"

Subscribers

People subscribed via source and target branches