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-10-07
Status: Merged
Merged at revision: 8
Proposed branch: lp:~bigdata-dev/charms/bundles/realtime-syslog-analytics/bundle
Merge into: lp:~charmers/charms/bundles/realtime-syslog-analytics/bundle
Diff against target: 95 lines (+12/-17)
3 files modified
bundle.yaml (+9/-9)
tests/00-setup (+0/-8)
tests/tests.yaml (+3/-0)
To merge this branch: bzr merge lp:~bigdata-dev/charms/bundles/realtime-syslog-analytics/bundle
Reviewer Review Type Date Requested Status
Juju Big Data Development 2015-10-07 Pending
Review via email: mp+273752@code.launchpad.net

Description of the change

fixup tests

To post a comment you must log in.
10. By Cory Johns on 2015-10-07

Updated to latest charm revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bundle.yaml'
2--- bundle.yaml 2015-10-02 19:58:46 +0000
3+++ bundle.yaml 2015-10-07 21:32:01 +0000
4@@ -1,32 +1,32 @@
5 services:
6 compute-slave:
7- charm: cs:trusty/apache-hadoop-compute-slave-8
8+ charm: cs:trusty/apache-hadoop-compute-slave-9
9 num_units: 3
10 annotations:
11 gui-x: "300"
12 gui-y: "200"
13 constraints: mem=3G
14 flume-hdfs:
15- charm: cs:trusty/apache-flume-hdfs-3
16+ charm: cs:trusty/apache-flume-hdfs-4
17 num_units: 1
18 annotations:
19 gui-x: "1200"
20 gui-y: "350"
21 flume-syslog:
22- charm: cs:trusty/apache-flume-syslog-2
23+ charm: cs:trusty/apache-flume-syslog-3
24 num_units: 1
25 annotations:
26 gui-x: "1200"
27 gui-y: "600"
28 hdfs-master:
29- charm: cs:trusty/apache-hadoop-hdfs-master-8
30+ charm: cs:trusty/apache-hadoop-hdfs-master-9
31 num_units: 1
32 annotations:
33 gui-x: "600"
34 gui-y: "350"
35 constraints: mem=7G
36 plugin:
37- charm: cs:trusty/apache-hadoop-plugin-7
38+ charm: cs:trusty/apache-hadoop-plugin-8
39 annotations:
40 gui-x: "900"
41 gui-y: "200"
42@@ -36,28 +36,28 @@
43 gui-x: "900"
44 gui-y: "600"
45 secondary-namenode:
46- charm: cs:trusty/apache-hadoop-hdfs-secondary-6
47+ charm: cs:trusty/apache-hadoop-hdfs-secondary-7
48 num_units: 1
49 annotations:
50 gui-x: "600"
51 gui-y: "600"
52 constraints: mem=7G
53 spark:
54- charm: cs:trusty/apache-spark-2
55+ charm: cs:trusty/apache-spark-4
56 num_units: 1
57 annotations:
58 gui-x: "1200"
59 gui-y: "100"
60 constraints: mem=7G
61 yarn-master:
62- charm: cs:trusty/apache-hadoop-yarn-master-6
63+ charm: cs:trusty/apache-hadoop-yarn-master-7
64 num_units: 1
65 annotations:
66 gui-x: "600"
67 gui-y: "100"
68 constraints: mem=7G
69 zeppelin:
70- charm: cs:trusty/apache-zeppelin-4
71+ charm: cs:trusty/apache-zeppelin-5
72 annotations:
73 gui-x: "1500"
74 gui-y: "100"
75
76=== removed file 'tests/00-setup'
77--- tests/00-setup 2015-10-02 19:02:34 +0000
78+++ tests/00-setup 1970-01-01 00:00:00 +0000
79@@ -1,8 +0,0 @@
80-#!/bin/bash
81-
82-if ! python3 -c 'import amulet' &> /dev/null; then
83- echo Installing Amulet...
84- sudo add-apt-repository -y ppa:juju/stable
85- sudo apt-get update
86- sudo apt-get -y install amulet
87-fi
88
89=== added file 'tests/tests.yaml'
90--- tests/tests.yaml 1970-01-01 00:00:00 +0000
91+++ tests/tests.yaml 2015-10-07 21:32:01 +0000
92@@ -0,0 +1,3 @@
93+reset: false
94+packages:
95+ - amulet

Subscribers

People subscribed via source and target branches