juju-core

Merge lp:~frankban/juju-core/update-testing-package into lp:~go-bot/juju-core/trunk

  1. update-testing-package
  2. Merge into trunk
Proposed by Francesco Banconi
Status: Merged
Approved by: Martin Packman
Approved revision: no longer in the source branch.
Merged at revision: 2783
Proposed branch: lp:~frankban/juju-core/update-testing-package
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:~frankban/juju-core/update-testing-package
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+220772@code.launchpad.net

Commit message

Update the github.com/juju/testing dependency.

Description of the change

Update the github.com/juju/testing dependency.

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

Reviewers: mp+220772_code.launchpad.net,

Message:
Please take a look.

Description:
Update the github.com/juju/testing dependency.

https://code.launchpad.net/~frankban/juju-core/update-testing-package/+merge/220772

(do not edit description out of merge proposal)

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

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-20140523044122-vwjxieaj0553li81
+New revision:
<email address hidden>

Index: dependencies.tsv
=== modified file 'dependencies.tsv'
--- dependencies.tsv 2014-05-21 01:16:44 +0000
+++ dependencies.tsv 2014-05-23 09:06:57 +0000
@@ -8,7 +8,7 @@
  github.com/juju/errors git 075df0417dbcc39d24ee18248d2f8d6e3eed598b
  github.com/juju/loggo git 7e8c70b24b80b95b2284f09306aac0bd93588db8
  github.com/juju/ratelimit git 0025ab75db6c6eaa4ffff0240c2c9e617ad1a0eb
-github.com/juju/testing git 9c0e0686136637876ae659e9056897575236e11f
+github.com/juju/testing git a99ca0f5b8d5b7ad608fd7214e8ba3d7b6279f63
  labix.org/v2/mgo bzr <email address hidden>
273
  launchpad.net/gnuflag bzr
<email address hidden> 12
  launchpad.net/goamz bzr
<email address hidden> 44

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

On 2014/05/23 09:34:37, frankban wrote:
> Please take a look.

LGTM

https://codereview.appspot.com/100740044/

Revision history for this message
Go Bot (go-bot) wrote :

The attempt to merge lp:~frankban/juju-core/update-testing-package into lp:juju-core failed. Below is the output from the failed tests.

godeps: cannot update "/home/tarmac/trees/src/github.com/juju/testing": fatal: reference is not a tree: a99ca0f5b8d5b7ad608fd7214e8ba3d7b6279f63
mongod: no process found

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 2014-05-21 01:16:44 +0000
3+++ dependencies.tsv 2014-05-23 09:45:42 +0000
4@@ -8,7 +8,7 @@
5 github.com/juju/errors git 075df0417dbcc39d24ee18248d2f8d6e3eed598b
6 github.com/juju/loggo git 7e8c70b24b80b95b2284f09306aac0bd93588db8
7 github.com/juju/ratelimit git 0025ab75db6c6eaa4ffff0240c2c9e617ad1a0eb
8-github.com/juju/testing git 9c0e0686136637876ae659e9056897575236e11f
9+github.com/juju/testing git a99ca0f5b8d5b7ad608fd7214e8ba3d7b6279f63
10 labix.org/v2/mgo bzr gustavo@niemeyer.net-20140331185009-fhnh3xzfdpicup0j 273
11 launchpad.net/gnuflag bzr roger.peppe@canonical.com-20121003093437-zcyyw0lpvj2nifpk 12
12 launchpad.net/goamz bzr roger.peppe@canonical.com-20131218155244-hbnkvlkkzy3vmlh9 44

Subscribers

People subscribed via source and target branches

to status/vote changes: