juju-core

Merge lp:~gz/juju-core/boilerplate_doclink_ec2 into lp:~go-bot/juju-core/trunk

  1. boilerplate_doclink_ec2
  2. Merge into trunk
Proposed by Martin Packman
Status: Merged
Approved by: Martin Packman
Approved revision: no longer in the source branch.
Merged at revision: 1761
Proposed branch: lp:~gz/juju-core/boilerplate_doclink_ec2
Merge into: lp:~go-bot/juju-core/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
provider/ec2/ec2.go (+1/-1)
To merge this branch: bzr merge lp:~gz/juju-core/boilerplate_doclink_ec2
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+184111@code.launchpad.net

Commit message

provider/ec2: Update boilerplate config doc link

https://codereview.appspot.com/13562043/

R=dimitern

Description of the change

provider/ec2: Update boilerplate config doc link

Gah, editor screwup means this change missed the branch that
just landed. Attempt #2.

https://codereview.appspot.com/13562043/

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

Reviewers: mp+184111_code.launchpad.net,

Message:
Please take a look.

Description:
provider/ec2: Update boilerplate config doc link

Gah, editor screwup means this change missed the branch that
just landed. Attempt #2.

https://code.launchpad.net/~gz/juju-core/boilerplate_doclink_ec2/+merge/184111

(do not edit description out of merge proposal)

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

Affected files (+3, -1 lines):
   A [revision details]
   M provider/ec2/ec2.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-20130905134949-sqiytdkf0reofcls
+New revision: <email address hidden>

Index: provider/ec2/ec2.go
=== modified file 'provider/ec2/ec2.go'
--- provider/ec2/ec2.go 2013-08-27 18:33:36 +0000
+++ provider/ec2/ec2.go 2013-09-05 13:59:11 +0000
@@ -165,7 +165,7 @@

  func (p environProvider) BoilerplateConfig() string {
   return `
-## https://juju.ubuntu.com/get-started/amazon/
+## https://juju.ubuntu.com/docs/config-aws.html
  amazon:
    type: ec2
    admin-secret: {{rand}}

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

LGTM, I like branches like this :)

https://codereview.appspot.com/13562043/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'provider/ec2/ec2.go'
2--- provider/ec2/ec2.go 2013-08-27 18:33:36 +0000
3+++ provider/ec2/ec2.go 2013-09-05 14:16:24 +0000
4@@ -165,7 +165,7 @@
5
6 func (p environProvider) BoilerplateConfig() string {
7 return `
8-## https://juju.ubuntu.com/get-started/amazon/
9+## https://juju.ubuntu.com/docs/config-aws.html
10 amazon:
11 type: ec2
12 admin-secret: {{rand}}

Subscribers

People subscribed via source and target branches

to status/vote changes: