Merge lp:~axwalk/juju-core/dependencies-tsv-update-goamz-empty-dnsname into lp:~go-bot/juju-core/trunk

Proposed by Andrew Wilkins
Status: Merged
Approved by: William Reade
Approved revision: no longer in the source branch.
Merged at revision: 2179
Proposed branch: lp:~axwalk/juju-core/dependencies-tsv-update-goamz-empty-dnsname
Merge into: lp:~go-bot/juju-core/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
dependencies.tsv (+1/-1)
To merge this branch: bzr merge lp:~axwalk/juju-core/dependencies-tsv-update-goamz-empty-dnsname
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+199489@code.launchpad.net

Commit message

dependencies.tsv: update goamz

This exercises some code in the ec2 provider
that wasn't previously covered in any local
tests.

https://codereview.appspot.com/43870043/

Description of the change

dependencies.tsv: update goamz

This exercises some code in the ec2 provider
that wasn't previously covered in any local
tests.

https://codereview.appspot.com/43870043/

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

Reviewers: mp+199489_code.launchpad.net,

Message:
Please take a look.

Description:
dependencies.tsv: update goamz

This exercises some code in the ec2 provider
that wasn't previously covered in any local
tests.

https://code.launchpad.net/~axwalk/juju-core/dependencies-tsv-update-goamz-empty-dnsname/+merge/199489

(do not edit description out of merge proposal)

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

Affected files (+3, -1 lines):
   A [revision details]
   M dependencies.tsv

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-20131218153824-g30x9idfa31zz1te
+New revision: <email address hidden>

Index: dependencies.tsv
=== modified file 'dependencies.tsv'
--- dependencies.tsv 2013-12-04 15:34:47 +0000
+++ dependencies.tsv 2013-12-18 15:58:05 +0000
@@ -2,7 +2,7 @@
  code.google.com/p/go.net hg 3591c18acabc99439c783463ef00e6dc277eee39 77
  labix.org/v2/mgo bzr <email address hidden>
240
  launchpad.net/gnuflag bzr
<email address hidden> 12
-launchpad.net/goamz bzr
<email address hidden> 43
+launchpad.net/goamz bzr
<email address hidden> 44
  launchpad.net/gocheck bzr
<email address hidden> 85
  launchpad.net/golxc bzr
<email address hidden> 5
  launchpad.net/gomaasapi bzr
<email address hidden> 47

Revision history for this message
Roger Peppe (rogpeppe) wrote :

On 18 December 2013 16:03, Andrew Wilkins <email address hidden> wrote:
> -launchpad.net/goamz bzr
> <email address hidden> 43
> +launchpad.net/goamz bzr
> <email address hidden> 44

This doesn't look quite right to me. The revid should have changed as
well as the revno.

I think the new line should be:

launchpad.net/goamz bzr
<email address hidden> 44

Revision history for this message
Andrew Wilkins (axwalk) wrote :

Sorry, fixing

Revision history for this message
Andrew Wilkins (axwalk) wrote :
Revision history for this message
William Reade (fwereade) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dependencies.tsv'
2--- dependencies.tsv 2013-12-04 15:34:47 +0000
3+++ dependencies.tsv 2013-12-19 03:19:47 +0000
4@@ -2,7 +2,7 @@
5 code.google.com/p/go.net hg 3591c18acabc99439c783463ef00e6dc277eee39 77
6 labix.org/v2/mgo bzr gustavo@niemeyer.net-20130830194015-zk51jnp704tqmp7n 240
7 launchpad.net/gnuflag bzr roger.peppe@canonical.com-20121003093437-zcyyw0lpvj2nifpk 12
8-launchpad.net/goamz bzr gustavo@niemeyer.net-20131004171246-efk7aix6irtazp2m 43
9+launchpad.net/goamz bzr roger.peppe@canonical.com-20131218155244-hbnkvlkkzy3vmlh9 44
10 launchpad.net/gocheck bzr gustavo@niemeyer.net-20130302024745-6ikofwq2c03h7giu 85
11 launchpad.net/golxc bzr frank.mueller@canonical.com-20130617094614-jelomk87defuetol 5
12 launchpad.net/gomaasapi bzr ian.booth@canonical.com-20131017011445-m1hmr0ap14osd7li 47

Subscribers

People subscribed via source and target branches

to status/vote changes: