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 |
Related bugs: |
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!
To post a comment you must log in.
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): deployer- 0.3.2.tar. gz deployer- 0.3.4.tar. gz -0.15.tar. gz -0.17.5. tar.gz requirements. pip
A [revision details]
D deps/juju-
A deps/juju-
D deps/jujuclient
A deps/jujuclient
M revision
M server-
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 requirements. pip' requirements. pip 2014-03-04 18:31:51 +0000 requirements. pip 2014-03-17 11:16:15 +0000 client= =0.12.0 =0.3.2 =0.3.4 ==0.3.0
=== modified file 'server-
--- server-
+++ server-
@@ -26,6 +26,6 @@
futures==2.1.4
tornado==3.1.1
websocket-
-jujuclient==0.15
-juju-deployer=
+jujuclient==0.17.5
+juju-deployer=
charmworldlib
Index: deps/juju- deployer- 0.3.2.tar. gz deployer- 0.3.2.tar. gz' deployer- 0.3.2.tar. gz 2014-02-20 13:08:59 +0000 and deployer- 0.3.2.tar. gz 1970-01-01 00:00:00 +0000 differ
=== removed file 'deps/juju-
Binary files deps/juju-
deps/juju-
Index: deps/juju- deployer- 0.3.4.tar. gz deployer- 0.3.4.tar. gz' deployer- 0.3.4.tar. gz 1970-01-01 00:00:00 +0000 and deployer- 0.3.4.tar. gz 2014-03-17 11:16:15 +0000 differ
=== added file 'deps/juju-
Binary files deps/juju-
deps/juju-
Index: deps/jujuclient -0.15.tar. gz t-0.15. tar.gz' -0.15.tar. gz 2013-11-12 11:29:42 +0000 and -0.15.tar. gz 1970-01-01 00:00:00 +0000 differ
=== removed file 'deps/jujuclien
Binary files deps/jujuclient
deps/jujuclient
Index: deps/jujuclient -0.17.5. tar.gz t-0.17. 5.tar.gz' -0.17.5. tar.gz 1970-01-01 00:00:00 +0000 and -0.17.5. tar.gz 2014-03-17 11:16:15 +0000 differ
=== added file 'deps/jujuclien
Binary files deps/jujuclient
deps/jujuclient