juju-quickstart

Merge lp:~frankban/juju-quickstart/bundlelib-032 into lp:juju-quickstart

  1. bundlelib-032
  2. Merge into trunk
Proposed by Francesco Banconi
Status: Merged
Merged at revision: 145
Proposed branch: lp:~frankban/juju-quickstart/bundlelib-032
Merge into: lp:juju-quickstart
Diff against target: 60 lines (+6/-6)
2 files modified
quickstart/tests/models/test_bundles.py (+2/-2)
tox.ini (+4/-4)
To merge this branch: bzr merge lp:~frankban/juju-quickstart/bundlelib-032
Reviewer Review Type Date Requested Status
Francesco Banconi Approve
Review via email: mp+278932@code.launchpad.net

Description of the change

Update to jujubundlelib 0.3.2.

To post a comment you must log in.
Revision history for this message
Francesco Banconi (frankban) wrote :

Self-review: trivial.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'quickstart/tests/models/test_bundles.py'
2--- quickstart/tests/models/test_bundles.py 2015-10-28 09:33:57 +0000
3+++ quickstart/tests/models/test_bundles.py 2015-11-30 09:24:17 +0000
4@@ -82,7 +82,7 @@
5 'requires': []},
6 {'id': 'deploy-1',
7 'method': 'deploy',
8- 'args': ['$addCharm-0', 'mysql', {}, ''],
9+ 'args': ['$addCharm-0', 'mysql', {}, '', {}],
10 'requires': ['addCharm-0']},
11 {'id': 'addCharm-2',
12 'method': 'addCharm',
13@@ -90,7 +90,7 @@
14 'requires': []},
15 {'id': 'deploy-3',
16 'method': 'deploy',
17- 'args': ['$addCharm-2', 'wordpress', {}, ''],
18+ 'args': ['$addCharm-2', 'wordpress', {}, '', {}],
19 'requires': ['addCharm-2']},
20 {'id': 'addUnit-4',
21 'method': 'addUnit',
22
23=== modified file 'tox.ini'
24--- tox.ini 2015-11-23 14:57:26 +0000
25+++ tox.ini 2015-11-30 09:24:17 +0000
26@@ -72,7 +72,7 @@
27 # See https://launchpad.net/~juju/+archive/ubuntu/stable.
28 websocket-client==0.18.0
29 jujuclient==0.50.3
30- jujubundlelib==0.3.0
31+ jujubundlelib==0.3.2
32 urwid==1.2.1
33 # The distribution PyYAML requirement is used in this case.
34
35@@ -82,7 +82,7 @@
36 # Ubuntu 14.04 (trusty) distro dependencies.
37 websocket-client==0.12.0
38 jujuclient==0.17.5
39- jujubundlelib==0.3.0
40+ jujubundlelib==0.3.2
41 PyYAML==3.10
42 urwid==1.1.1
43
44@@ -92,7 +92,7 @@
45 # Ubuntu 15.04 (vivid) distro dependencies.
46 websocket-client==0.18.0
47 jujuclient==0.18.5
48- jujubundlelib==0.3.0
49+ jujubundlelib==0.3.2
50 PyYAML==3.11
51 urwid==1.2.1
52
53@@ -102,7 +102,7 @@
54 # Ubuntu 15.10 (wily) distro dependencies.
55 websocket-client==0.18.0
56 jujuclient==0.50.1
57- jujubundlelib==0.3.0
58+ jujubundlelib==0.3.2
59 PyYAML==3.11
60 urwid==1.2.1
61

Subscribers

People subscribed via source and target branches