juju-core

Merge lp:~axwalk/juju-core/lp1210328-update-ppa into lp:~go-bot/juju-core/trunk

  1. lp1210328-update-ppa
  2. Merge into trunk
Proposed by Andrew Wilkins
Status: Merged
Approved by: Andrew Wilkins
Approved revision: no longer in the source branch.
Merged at revision: 1630
Proposed branch: lp:~axwalk/juju-core/lp1210328-update-ppa
Merge into: lp:~go-bot/juju-core/trunk
Diff against target: 25 lines (+2/-2)
2 files modified
environs/cloudinit/cloudinit.go (+1/-1)
environs/cloudinit/cloudinit_test.go (+1/-1)
To merge this branch: bzr merge lp:~axwalk/juju-core/lp1210328-update-ppa
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+179340@code.launchpad.net

Commit message

Update juju ppa in cloudinit to juju/stable

James Page has updated the juju/stable PPA to
include mongodb for Precise and Quantal. We
need to update our code and docs accordingly.

Fixes bug #1210328

https://codereview.appspot.com/12583044/

Description of the change

Update juju ppa in cloudinit to juju/stable

James Page has updated the juju/stable PPA to
include mongodb for Precise and Quantal. We
need to update our code and docs accordingly.

Fixes bug #1210328

https://codereview.appspot.com/12583044/

To post a comment you must log in.
Revision history for this message
Andrew Wilkins (axwalk) wrote :

Reviewers: mp+179340_code.launchpad.net,

Message:
Please take a look.

Description:
Update juju ppa in cloudinit to juju/stable

James Page has updated the juju/stable PPA to
include mongodb for Precise and Quantal. We
need to update our code and docs accordingly.

Fixes bug #1210328

https://code.launchpad.net/~axwalk/juju-core/lp1210328-update-ppa/+merge/179340

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M environs/cloudinit/cloudinit.go
   M environs/cloudinit/cloudinit_test.go

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: tarmac-20130809021225-6c5p05y8zs5j83o3
+New revision: <email address hidden>

Index: environs/cloudinit/cloudinit.go
=== modified file 'environs/cloudinit/cloudinit.go'
--- environs/cloudinit/cloudinit.go 2013-08-02 15:50:58 +0000
+++ environs/cloudinit/cloudinit.go 2013-08-09 06:56:44 +0000
@@ -171,7 +171,7 @@

   if cfg.StateServer {
    if cfg.NeedMongoPPA() {
- c.AddAptSource("ppa:juju/experimental", "1024R/C8068B11")
+ c.AddAptSource("ppa:juju/stable", "1024R/C8068B11")
    }
    c.AddPackage("mongodb-server")
    certKey := string(cfg.StateServerCert) + string(cfg.StateServerKey)

Index: environs/cloudinit/cloudinit_test.go
=== modified file 'environs/cloudinit/cloudinit_test.go'
--- environs/cloudinit/cloudinit_test.go 2013-08-02 15:50:58 +0000
+++ environs/cloudinit/cloudinit_test.go 2013-08-09 06:56:44 +0000
@@ -322,7 +322,7 @@
    if test.cfg.StateServer {
     checkPackage(c, x, "mongodb-server", true)
     source := struct{ source, key string }{
- source: "ppa:juju/experimental",
+ source: "ppa:juju/stable",
      key: "1024R/C8068B11",
     }
     checkAptSource(c, x, source, test.cfg.NeedMongoPPA())

Revision history for this message
Dimiter Naydenov (dimitern) wrote :

LGTM

https://codereview.appspot.com/12583044/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'environs/cloudinit/cloudinit.go'
2--- environs/cloudinit/cloudinit.go 2013-08-02 15:50:58 +0000
3+++ environs/cloudinit/cloudinit.go 2013-08-09 07:00:55 +0000
4@@ -171,7 +171,7 @@
5
6 if cfg.StateServer {
7 if cfg.NeedMongoPPA() {
8- c.AddAptSource("ppa:juju/experimental", "1024R/C8068B11")
9+ c.AddAptSource("ppa:juju/stable", "1024R/C8068B11")
10 }
11 c.AddPackage("mongodb-server")
12 certKey := string(cfg.StateServerCert) + string(cfg.StateServerKey)
13
14=== modified file 'environs/cloudinit/cloudinit_test.go'
15--- environs/cloudinit/cloudinit_test.go 2013-08-02 15:50:58 +0000
16+++ environs/cloudinit/cloudinit_test.go 2013-08-09 07:00:55 +0000
17@@ -322,7 +322,7 @@
18 if test.cfg.StateServer {
19 checkPackage(c, x, "mongodb-server", true)
20 source := struct{ source, key string }{
21- source: "ppa:juju/experimental",
22+ source: "ppa:juju/stable",
23 key: "1024R/C8068B11",
24 }
25 checkAptSource(c, x, source, test.cfg.NeedMongoPPA())

Subscribers

People subscribed via source and target branches

to status/vote changes: