Merge lp:~celebdor/charms/trusty/midonet-agent/cassandra into lp:charms/trusty/midonet-agent

Proposed by Antoni Segura Puimedon on 2016-02-26
Status: Merged
Merged at revision: 35
Proposed branch: lp:~celebdor/charms/trusty/midonet-agent/cassandra
Merge into: lp:charms/trusty/midonet-agent
Diff against target: 20 lines (+7/-2)
1 file modified
tests/basic_deployment.py (+7/-2)
To merge this branch: bzr merge lp:~celebdor/charms/trusty/midonet-agent/cassandra
Reviewer Review Type Date Requested Status
Cory Johns 2016-02-26 Approve on 2016-02-26
Review via email: mp+287338@code.launchpad.net
To post a comment you must log in.
36. By Antoni Segura Puimedon <email address hidden> on 2016-02-26

fix lack of null keys so that extra keys and extra sources match

Cory Johns (johnsca) wrote :

Thanks for this. It has been merged with the small addition of quotes around the strings in the list.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/basic_deployment.py'
2--- tests/basic_deployment.py 2016-02-16 14:38:28 +0000
3+++ tests/basic_deployment.py 2016-02-26 19:55:23 +0000
4@@ -100,9 +100,14 @@
5 self.d.configure('cassandra', {
6 'authenticator': 'AllowAllAuthenticator',
7 'cluster_name': 'midonet',
8- 'install_keys': '7E41C00F85BFC1706C4FFFB3350200F2B999A372',
9+ 'install_keys':
10+ '[null, '
11+ 'null, '
12+ '7E41C00F85BFC1706C4FFFB3350200F2B999A372]',
13 'install_sources':
14- 'deb http://debian.datastax.com/community 2.0 main',
15+ '[ppa:openjdk-r/ppa, '
16+ 'ppa:stub/cassandra, '
17+ 'deb http://debian.datastax.com/community 2.0 main]',
18 'extra_packages': 'dsc20'})
19
20 self.d.configure('mysql', {'max-connections': 500})

Subscribers

People subscribed via source and target branches