Merge lp:~frankban/charms/precise/juju-gui/update-deployer-deps into lp:~juju-gui/charms/precise/juju-gui/trunk

Proposed by Francesco Banconi
Status: Merged
Merged at revision: 174
Proposed branch: lp:~frankban/charms/precise/juju-gui/update-deployer-deps
Merge into: lp:~juju-gui/charms/precise/juju-gui/trunk
Diff against target: 27 lines (+3/-3)
2 files modified
revision (+1/-1)
server-requirements.pip (+2/-2)
To merge this branch: bzr merge lp:~frankban/charms/precise/juju-gui/update-deployer-deps
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+211305@code.launchpad.net

Description of the change

Update juju-deployer and python-jujuclient.

Update GUI server/juju requirements to the newest version.

QA:
- bootstrap a juju-core trunk env;
- make deploy;
- open the GUI, ensure the GUI server works well by:
  - using the GUI as usual (deploy a charm, change settings, etc.);
  - deploying a bundle from the GUI;
  - deploying a local charm from the GUI;
  - going to /gui-server-info and checking everything seems fine.
- destroy the environment, thank you!

https://codereview.appspot.com/75190044/

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

Reviewers: mp+211305_code.launchpad.net,

Message:
Please take a look.

Description:
Update juju-deployer and python-jujuclient.

Update GUI server/juju requirements to the newest version.

QA:
- bootstrap a juju-core trunk env;
- make deploy;
- open the GUI, ensure the GUI server works well by:
   - using the GUI as usual (deploy a charm, change settings, etc.);
   - deploying a bundle from the GUI;
   - deploying a local charm from the GUI;
   - going to /gui-server-info and checking everything seems fine.
- destroy the environment, thank you!

https://code.launchpad.net/~frankban/charms/precise/juju-gui/update-deployer-deps/+merge/211305

(do not edit description out of merge proposal)

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

Affected files (+1, --1 lines):
   A [revision details]
   D deps/juju-deployer-0.3.2.tar.gz
   A deps/juju-deployer-0.3.4.tar.gz
   D deps/jujuclient-0.15.tar.gz
   A deps/jujuclient-0.17.5.tar.gz
   M revision
   M server-requirements.pip

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: revision
=== modified file 'revision'
--- revision 2014-03-13 18:06:16 +0000
+++ revision 2014-03-17 12:45:59 +0000
@@ -1,1 +1,1 @@
-108
+109

Index: server-requirements.pip
=== modified file 'server-requirements.pip'
--- server-requirements.pip 2014-03-04 18:31:51 +0000
+++ server-requirements.pip 2014-03-17 11:16:15 +0000
@@ -26,6 +26,6 @@
  futures==2.1.4
  tornado==3.1.1
  websocket-client==0.12.0
-jujuclient==0.15
-juju-deployer==0.3.2
+jujuclient==0.17.5
+juju-deployer==0.3.4
  charmworldlib==0.3.0

Index: deps/juju-deployer-0.3.2.tar.gz
=== removed file 'deps/juju-deployer-0.3.2.tar.gz'
Binary files deps/juju-deployer-0.3.2.tar.gz 2014-02-20 13:08:59 +0000 and
deps/juju-deployer-0.3.2.tar.gz 1970-01-01 00:00:00 +0000 differ

Index: deps/juju-deployer-0.3.4.tar.gz
=== added file 'deps/juju-deployer-0.3.4.tar.gz'
Binary files deps/juju-deployer-0.3.4.tar.gz 1970-01-01 00:00:00 +0000 and
deps/juju-deployer-0.3.4.tar.gz 2014-03-17 11:16:15 +0000 differ

Index: deps/jujuclient-0.15.tar.gz
=== removed file 'deps/jujuclient-0.15.tar.gz'
Binary files deps/jujuclient-0.15.tar.gz 2013-11-12 11:29:42 +0000 and
deps/jujuclient-0.15.tar.gz 1970-01-01 00:00:00 +0000 differ

Index: deps/jujuclient-0.17.5.tar.gz
=== added file 'deps/jujuclient-0.17.5.tar.gz'
Binary files deps/jujuclient-0.17.5.tar.gz 1970-01-01 00:00:00 +0000 and
deps/jujuclient-0.17.5.tar.gz 2014-03-17 11:16:15 +0000 differ

Revision history for this message
Madison Scott-Clary (makyo) wrote :
Revision history for this message
Francesco Banconi (frankban) wrote :

*** Submitted:

Update juju-deployer and python-jujuclient.

Update GUI server/juju requirements to the newest version.

QA:
- bootstrap a juju-core trunk env;
- make deploy;
- open the GUI, ensure the GUI server works well by:
   - using the GUI as usual (deploy a charm, change settings, etc.);
   - deploying a bundle from the GUI;
   - deploying a local charm from the GUI;
   - going to /gui-server-info and checking everything seems fine.
- destroy the environment, thank you!

R=matthew.scott
CC=
https://codereview.appspot.com/75190044

https://codereview.appspot.com/75190044/

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'deps/juju-deployer-0.3.2.tar.gz'
2Binary files deps/juju-deployer-0.3.2.tar.gz 2014-02-20 13:08:59 +0000 and deps/juju-deployer-0.3.2.tar.gz 1970-01-01 00:00:00 +0000 differ
3=== added file 'deps/juju-deployer-0.3.4.tar.gz'
4Binary files deps/juju-deployer-0.3.4.tar.gz 1970-01-01 00:00:00 +0000 and deps/juju-deployer-0.3.4.tar.gz 2014-03-17 12:58:42 +0000 differ
5=== removed file 'deps/jujuclient-0.15.tar.gz'
6Binary files deps/jujuclient-0.15.tar.gz 2013-11-12 11:29:42 +0000 and deps/jujuclient-0.15.tar.gz 1970-01-01 00:00:00 +0000 differ
7=== added file 'deps/jujuclient-0.17.5.tar.gz'
8Binary files deps/jujuclient-0.17.5.tar.gz 1970-01-01 00:00:00 +0000 and deps/jujuclient-0.17.5.tar.gz 2014-03-17 12:58:42 +0000 differ
9=== modified file 'revision'
10--- revision 2014-03-13 18:06:16 +0000
11+++ revision 2014-03-17 12:58:42 +0000
12@@ -1,1 +1,1 @@
13-108
14+109
15
16=== modified file 'server-requirements.pip'
17--- server-requirements.pip 2014-03-04 18:31:51 +0000
18+++ server-requirements.pip 2014-03-17 12:58:42 +0000
19@@ -26,6 +26,6 @@
20 futures==2.1.4
21 tornado==3.1.1
22 websocket-client==0.12.0
23-jujuclient==0.15
24-juju-deployer==0.3.2
25+jujuclient==0.17.5
26+juju-deployer==0.3.4
27 charmworldlib==0.3.0

Subscribers

People subscribed via source and target branches