Merge lp://staging/~frankban/juju-quickstart/update-defaults-15-06-16 into lp://staging/juju-quickstart
Proposed by
Francesco Banconi
Status: | Merged |
---|---|
Merged at revision: | 137 |
Proposed branch: | lp://staging/~frankban/juju-quickstart/update-defaults-15-06-16 |
Merge into: | lp://staging/juju-quickstart |
Diff against target: |
14 lines (+2/-2) 1 file modified
quickstart/settings.py (+2/-2) |
To merge this branch: | bzr merge lp://staging/~frankban/juju-quickstart/update-defaults-15-06-16 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju GUI Hackers | Pending | ||
Review via email: mp+262221@code.staging.launchpad.net |
Description of the change
Update Juju GUI charm default revisions.
To post a comment you must log in.
Reviewers: mp+262221_ code.launchpad. net,
Message:
Please take a look.
Description:
Update Juju GUI charm default revisions.
https:/ /code.launchpad .net/~frankban/ juju-quickstart /update- defaults- 15-06-16/ +merge/ 262221
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/249750043/
Affected files (+4, -2 lines): settings. py
A [revision details]
M quickstart/
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: quickstart/ settings. py settings. py' settings. py 2015-06-05 07:32:23 +0000 settings. py 2015-06-17 14:02:03 +0000 CHARM_URLS = collections. OrderedDict( ( juju-gui- 115'), juju-gui- 28'), juju-gui- 117'), juju-gui- 32'),
=== modified file 'quickstart/
--- quickstart/
+++ quickstart/
@@ -37,8 +37,8 @@
# temporary connection/charm store errors.
# Keep this list sorted by release date (older first).
DEFAULT_
- ('precise', 'cs:precise/
- ('trusty', 'cs:trusty/
+ ('precise', 'cs:precise/
+ ('trusty', 'cs:trusty/
))
# The quickstart app short description.