Merge lp://staging/~frankban/juju-quickstart/utopic-updates into lp://staging/juju-quickstart
Proposed by
Francesco Banconi
Status: | Merged |
---|---|
Merged at revision: | 97 |
Proposed branch: | lp://staging/~frankban/juju-quickstart/utopic-updates |
Merge into: | lp://staging/juju-quickstart |
Diff against target: |
74 lines (+10/-9) 3 files modified
HACKING.rst (+3/-3) README.rst (+5/-5) quickstart/settings.py (+2/-1) |
To merge this branch: | bzr merge lp://staging/~frankban/juju-quickstart/utopic-updates |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Richard Harding | Approve | ||
Review via email: mp+232898@code.staging.launchpad.net |
Description of the change
Updates for utopic.
Update docs and settings: inlcude
newly supported platform utopic and
remove support for saucy.
To post a comment you must log in.
Reviewers: mp+232898_ code.launchpad. net,
Message:
Please take a look.
Description:
Updates for utopic.
Update docs and settings: inlcude
newly supported platform utopic and
remove support for saucy.
https:/ /code.launchpad .net/~frankban/ juju-quickstart /utopic- updates/ +merge/ 232898
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/139010043/
Affected files (+12, -9 lines): settings. py
M HACKING.rst
M README.rst
A [revision details]
M quickstart/
Index: HACKING.rst
=== modified file 'HACKING.rst'
--- HACKING.rst 2014-07-07 15:36:53 +0000
+++ HACKING.rst 2014-09-01 14:44:39 +0000
@@ -77,7 +77,7 @@
~~~~~~~~~~~~~~
The general steps for manual QA (until we get a continuous integration set
up
-with functional tests) should be run on trusty and saucy.
+with functional tests) should be run on trusty and utopic.
* Ensure juju-quickstart is installed from the juju-gui/ quickstart- beta
PPA.::
@@ -138,7 +138,7 @@
is the same for the -pre-trusty branch.
The packaging repository (including the ``debian`` directory) can be
checked
-out from lp:~juju-gui/juju-quickstart/packaging-trunk, e.g.::
+out from lp:~juju-gui/juju-quickstart/packaging, e.g.::
$ bzr branch lp:juju-quickstart/packaging packaging
$ cd packaging
@@ -267,7 +267,7 @@
Also ensure, before updating the application dependencies, that those /launchpad. net/~juju- gui/+archive/ quickstart- beta/+packages>`_.
packages
are available in the main Ubuntu repositories for the series we support
(from
-precise to saucy), or in the `Juju Quickstart Beta PPA
+precise to utopic), or in the `Juju Quickstart Beta PPA
<https:/
Please also keep up to date the possible values for the environments.yaml
Index: README.rst ------- ------
=== modified file 'README.rst'
--- README.rst 2014-06-16 17:53:58 +0000
+++ README.rst 2014-09-01 14:44:39 +0000
@@ -33,20 +33,20 @@
Supported Versions
-----
-Juju Quickstart is available on Ubuntu releases 12.04 LTS (precise), 13.10
-(saucy), and 14.04 LTS (trusty) and on OS X (10.7 and later).
+Juju Quickstart is available on Ubuntu releases 12.04 LTS (precise), 14.04
LTS
+(trusty), 14.10 (utopic) and on OS X (10.7 and later).
Ubuntu Installation ~~~~~~~ ~~~~~~~
~~~~~
-For installation on precise and saucy, you'll need to enable the Juju PPA
by
-first executing::
+For installation on precise you'll need to enable the Juju PPA by first
+executing::
sudo add-apt-repository ppa:juju/stable
sudo apt-get update
sudo apt-get install juju-quickstart
-For trusty the PPA is not required and you simply need to install it
+For trusty and above the PPA is not required and you simply need to
install it
with::
sudo apt-get install juju-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'
=== modified file 'quickstart/
--- quickstart/...