juju-quickstart

Merge lp:~frankban/juju-quickstart/jujubundlelib-017 into lp:juju-quickstart

  1. jujubundlelib-017
  2. Merge into trunk
Proposed by Francesco Banconi
Status: Merged
Merged at revision: 132
Proposed branch: lp:~frankban/juju-quickstart/jujubundlelib-017
Merge into: lp:juju-quickstart
Diff against target: 51 lines (+5/-5)
2 files modified
quickstart/__init__.py (+1/-1)
tox.ini (+4/-4)
To merge this branch: bzr merge lp:~frankban/juju-quickstart/jujubundlelib-017
Reviewer Review Type Date Requested Status
Juju GUI Hackers Pending
Review via email: mp+258754@code.launchpad.net

Description of the change

Update to jujubundlelib v0.1.7.

Also bump version up to 2.1.0.

https://codereview.appspot.com/234400043/

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

Reviewers: mp+258754_code.launchpad.net,

Message:
Please take a look.

Description:
Update to jujubundlelib v0.1.7.

Also bump version up to 2.1.0.

https://code.launchpad.net/~frankban/juju-quickstart/jujubundlelib-017/+merge/258754

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/234400043/

Affected files (+7, -5 lines):
   A [revision details]
   M quickstart/__init__.py
   M tox.ini

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision:
<email address hidden>

Index: tox.ini
=== modified file 'tox.ini'
--- tox.ini 2015-04-30 13:50:41 +0000
+++ tox.ini 2015-05-11 10:55:51 +0000
@@ -72,7 +72,7 @@
      # See https://launchpad.net/~juju/+archive/ubuntu/stable.
      websocket-client==0.18.0
      jujuclient==0.50.1
- jujubundlelib==0.1.6
+ jujubundlelib==0.1.7
      urwid==1.2.1
      # The distribution PyYAML requirement is used in this case.

@@ -82,7 +82,7 @@
      # Ubuntu 14.04 (trusty) distro dependencies.
      websocket-client==0.12.0
      jujuclient==0.17.5
- jujubundlelib==0.1.6
+ jujubundlelib==0.1.7
      PyYAML==3.10
      urwid==1.1.1

@@ -92,7 +92,7 @@
      # Ubuntu 14.10 (utopic) distro dependencies.
      websocket-client==0.12.0
      jujuclient==0.17.5
- jujubundlelib==0.1.6
+ jujubundlelib==0.1.7
      PyYAML==3.11
      urwid==1.2.1

@@ -102,7 +102,7 @@
      # Ubuntu 15.04 (vivid) distro dependencies.
      websocket-client==0.18.0
      jujuclient==0.18.5
- jujubundlelib==0.1.6
+ jujubundlelib==0.1.7
      PyYAML==3.11
      urwid==1.2.1

Index: quickstart/__init__.py
=== modified file 'quickstart/__init__.py'
--- quickstart/__init__.py 2015-05-07 19:48:26 +0000
+++ quickstart/__init__.py 2015-05-11 10:55:51 +0000
@@ -45,7 +45,7 @@
  Once Juju has been installed, the command can also be run as a juju plugin,
  without the hyphen ("juju quickstart").
  """
-VERSION = (2, 0, 2)
+VERSION = (2, 1, 0)

  def get_version():

Revision history for this message
Francesco Banconi (frankban) wrote :

Self review: trivial.

https://codereview.appspot.com/234400043/

Revision history for this message
Francesco Banconi (frankban) wrote :

*** Submitted:

Update to jujubundlelib v0.1.7.

Also bump version up to 2.1.0.

R=
CC=
https://codereview.appspot.com/234400043

https://codereview.appspot.com/234400043/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'quickstart/__init__.py'
--- quickstart/__init__.py 2015-05-07 19:48:26 +0000
+++ quickstart/__init__.py 2015-05-11 11:12:41 +0000
@@ -45,7 +45,7 @@
45Once Juju has been installed, the command can also be run as a juju plugin,45Once Juju has been installed, the command can also be run as a juju plugin,
46without the hyphen ("juju quickstart").46without the hyphen ("juju quickstart").
47"""47"""
48VERSION = (2, 0, 2)48VERSION = (2, 1, 0)
4949
5050
51def get_version():51def get_version():
5252
=== modified file 'tox.ini'
--- tox.ini 2015-04-30 13:50:41 +0000
+++ tox.ini 2015-05-11 11:12:41 +0000
@@ -72,7 +72,7 @@
72 # See https://launchpad.net/~juju/+archive/ubuntu/stable.72 # See https://launchpad.net/~juju/+archive/ubuntu/stable.
73 websocket-client==0.18.073 websocket-client==0.18.0
74 jujuclient==0.50.174 jujuclient==0.50.1
75 jujubundlelib==0.1.675 jujubundlelib==0.1.7
76 urwid==1.2.176 urwid==1.2.1
77 # The distribution PyYAML requirement is used in this case.77 # The distribution PyYAML requirement is used in this case.
7878
@@ -82,7 +82,7 @@
82 # Ubuntu 14.04 (trusty) distro dependencies.82 # Ubuntu 14.04 (trusty) distro dependencies.
83 websocket-client==0.12.083 websocket-client==0.12.0
84 jujuclient==0.17.584 jujuclient==0.17.5
85 jujubundlelib==0.1.685 jujubundlelib==0.1.7
86 PyYAML==3.1086 PyYAML==3.10
87 urwid==1.1.187 urwid==1.1.1
8888
@@ -92,7 +92,7 @@
92 # Ubuntu 14.10 (utopic) distro dependencies.92 # Ubuntu 14.10 (utopic) distro dependencies.
93 websocket-client==0.12.093 websocket-client==0.12.0
94 jujuclient==0.17.594 jujuclient==0.17.5
95 jujubundlelib==0.1.695 jujubundlelib==0.1.7
96 PyYAML==3.1196 PyYAML==3.11
97 urwid==1.2.197 urwid==1.2.1
9898
@@ -102,7 +102,7 @@
102 # Ubuntu 15.04 (vivid) distro dependencies.102 # Ubuntu 15.04 (vivid) distro dependencies.
103 websocket-client==0.18.0103 websocket-client==0.18.0
104 jujuclient==0.18.5104 jujuclient==0.18.5
105 jujubundlelib==0.1.6105 jujubundlelib==0.1.7
106 PyYAML==3.11106 PyYAML==3.11
107 urwid==1.2.1107 urwid==1.2.1
108108

Subscribers

People subscribed via source and target branches