juju-quickstart

Merge lp:~frankban/juju-quickstart/utopic-updates into lp:juju-quickstart

  1. utopic-updates
  2. Merge into trunk
Proposed by Francesco Banconi
Status: Merged
Merged at revision: 97
Proposed branch: lp:~frankban/juju-quickstart/utopic-updates
Merge into: lp: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:~frankban/juju-quickstart/utopic-updates
Reviewer Review Type Date Requested Status
Richard Harding Approve
Review via email: mp+232898@code.launchpad.net

Description of the change

Updates for utopic.

Update docs and settings: inlcude
newly supported platform utopic and
remove support for saucy.

https://codereview.appspot.com/139010043/

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

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):
   M HACKING.rst
   M README.rst
   A [revision details]
   M quickstart/settings.py

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
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://launchpad.net/~juju-gui/+archive/quickstart-beta/+packages>`_.

  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
=== modified file 'quickstart/settings.py'
--- quickstart/...

Read more...

lp:~frankban/juju-quickstart/utopic-updates updated
98. By Francesco Banconi

Fix repo in packaging instructions.

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

Please take a look.

https://codereview.appspot.com/139010043/

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

LGTM thanks!

https://codereview.appspot.com/139010043/

Revision history for this message
Richard Harding (rharding) wrote :

LGTM ty for the update

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

*** Submitted:

Updates for utopic.

Update docs and settings: inlcude
newly supported platform utopic and
remove support for saucy.

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

https://codereview.appspot.com/139010043/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'HACKING.rst'
--- HACKING.rst 2014-07-07 15:36:53 +0000
+++ HACKING.rst 2014-09-01 14:49:59 +0000
@@ -77,7 +77,7 @@
77~~~~~~~~~~~~~~77~~~~~~~~~~~~~~
7878
79The general steps for manual QA (until we get a continuous integration set up79The general steps for manual QA (until we get a continuous integration set up
80with functional tests) should be run on trusty and saucy.80with functional tests) should be run on trusty and utopic.
8181
82* Ensure juju-quickstart is installed from the juju-gui/quickstart-beta PPA.::82* Ensure juju-quickstart is installed from the juju-gui/quickstart-beta PPA.::
8383
@@ -138,7 +138,7 @@
138is the same for the -pre-trusty branch.138is the same for the -pre-trusty branch.
139139
140The packaging repository (including the ``debian`` directory) can be checked140The packaging repository (including the ``debian`` directory) can be checked
141out from lp:~juju-gui/juju-quickstart/packaging-trunk, e.g.::141out from lp:juju-quickstart/packaging, e.g.::
142142
143 $ bzr branch lp:juju-quickstart/packaging packaging143 $ bzr branch lp:juju-quickstart/packaging packaging
144 $ cd packaging144 $ cd packaging
@@ -267,7 +267,7 @@
267267
268Also ensure, before updating the application dependencies, that those packages268Also ensure, before updating the application dependencies, that those packages
269are available in the main Ubuntu repositories for the series we support (from269are available in the main Ubuntu repositories for the series we support (from
270precise to saucy), or in the `Juju Quickstart Beta PPA270precise to utopic), or in the `Juju Quickstart Beta PPA
271<https://launchpad.net/~juju-gui/+archive/quickstart-beta/+packages>`_.271<https://launchpad.net/~juju-gui/+archive/quickstart-beta/+packages>`_.
272272
273Please also keep up to date the possible values for the environments.yaml273Please also keep up to date the possible values for the environments.yaml
274274
=== modified file 'README.rst'
--- README.rst 2014-06-16 17:53:58 +0000
+++ README.rst 2014-09-01 14:49:59 +0000
@@ -33,20 +33,20 @@
33Supported Versions33Supported Versions
34------------------34------------------
3535
36Juju Quickstart is available on Ubuntu releases 12.04 LTS (precise), 13.1036Juju Quickstart is available on Ubuntu releases 12.04 LTS (precise), 14.04 LTS
37(saucy), and 14.04 LTS (trusty) and on OS X (10.7 and later).37(trusty), 14.10 (utopic) and on OS X (10.7 and later).
3838
39Ubuntu Installation39Ubuntu Installation
40~~~~~~~~~~~~~~~~~~~40~~~~~~~~~~~~~~~~~~~
4141
42For installation on precise and saucy, you'll need to enable the Juju PPA by42For installation on precise you'll need to enable the Juju PPA by first
43first executing::43executing::
4444
45 sudo add-apt-repository ppa:juju/stable45 sudo add-apt-repository ppa:juju/stable
46 sudo apt-get update46 sudo apt-get update
47 sudo apt-get install juju-quickstart47 sudo apt-get install juju-quickstart
4848
49For trusty the PPA is not required and you simply need to install it49For trusty and above the PPA is not required and you simply need to install it
50with::50with::
5151
52 sudo apt-get install juju-quickstart52 sudo apt-get install juju-quickstart
5353
=== modified file 'quickstart/settings.py'
--- quickstart/settings.py 2014-06-13 13:45:06 +0000
+++ quickstart/settings.py 2014-09-01 14:49:59 +0000
@@ -61,7 +61,8 @@
61}61}
6262
63# The possible values for the environments.yaml default-series field.63# The possible values for the environments.yaml default-series field.
64JUJU_DEFAULT_SERIES = ('precise', 'quantal', 'raring', 'saucy', 'trusty')64JUJU_DEFAULT_SERIES = (
65 'precise', 'quantal', 'raring', 'saucy', 'trusty', 'utopic')
6566
66# Retrieve the current juju-core home.67# Retrieve the current juju-core home.
67JUJU_HOME = os.getenv('JUJU_HOME', '~/.juju')68JUJU_HOME = os.getenv('JUJU_HOME', '~/.juju')

Subscribers

People subscribed via source and target branches