Merge lp:~dave-cheney/juju-core/178-update-errgo-and-loggo-dependencies into lp:~go-bot/juju-core/trunk

Proposed by Dave Cheney
Status: Merged
Approved by: Ian Booth
Approved revision: no longer in the source branch.
Merged at revision: 2757
Proposed branch: lp:~dave-cheney/juju-core/178-update-errgo-and-loggo-dependencies
Merge into: lp:~go-bot/juju-core/trunk
Diff against target: 15 lines (+2/-2)
1 file modified
dependencies.tsv (+2/-2)
To merge this branch: bzr merge lp:~dave-cheney/juju-core/178-update-errgo-and-loggo-dependencies
Reviewer Review Type Date Requested Status
Ian Booth Approve
Review via email: mp+220340@code.launchpad.net

Commit message

update errgo and loggo deps

Update errgo to pickup the change that removed loggo as a direct dependency as discussed on the mailing list

Update loggo while we're here as Thumper landed a fix to loggo on the 17th.

https://codereview.appspot.com/97570045/

Description of the change

update errgo and loggo deps

Update errgo to pickup the change that removed loggo as a direct dependency as discussed on the mailing list

Update loggo while we're here as Thumper landed a fix to loggo on the 17th.

https://codereview.appspot.com/97570045/

To post a comment you must log in.
Revision history for this message
Dave Cheney (dave-cheney) wrote :

Reviewers: mp+220340_code.launchpad.net,

Message:
Please take a look.

Description:
update errgo and loggo deps

Update errgo to pickup the change that removed loggo as a direct
dependency as discussed on the mailing list

Update loggo while we're here as Thumper landed a fix to loggo on the
17th.

https://code.launchpad.net/~dave-cheney/juju-core/178-update-errgo-and-loggo-dependencies/+merge/220340

(do not edit description out of merge proposal)

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

Affected files (+4, -2 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-20140521004007-nb7118jha7yiwr6o
+New revision: <email address hidden>

Index: dependencies.tsv
=== modified file 'dependencies.tsv'
--- dependencies.tsv 2014-05-18 23:12:12 +0000
+++ dependencies.tsv 2014-05-21 01:16:44 +0000
@@ -4,9 +4,9 @@
  github.com/joyent/gomanta git ff785814c0ebb4050420a2f1d47895b35b8808f2
  github.com/joyent/gosdc git 10bbe92c5d98c8b38a0b7f62ee042c7252150efc
  github.com/joyent/gosign git 476720af5427223da5420afbbadf620bfb760345
-github.com/juju/errgo git f6b8bbf169635df7d536aef8bd14e808cf28c6db
+github.com/juju/errgo git 26caa7d4884f6048c5687fa44c410e5d5d95e554
  github.com/juju/errors git 075df0417dbcc39d24ee18248d2f8d6e3eed598b
-github.com/juju/loggo git fa3acf9ab9ed09aea29030558528e24a254d27af
+github.com/juju/loggo git 7e8c70b24b80b95b2284f09306aac0bd93588db8
  github.com/juju/ratelimit git 0025ab75db6c6eaa4ffff0240c2c9e617ad1a0eb
  github.com/juju/testing git 9c0e0686136637876ae659e9056897575236e11f
  labix.org/v2/mgo bzr <email address hidden>
273

Revision history for this message
Ian Booth (wallyworld) :
review: Approve
Revision history for this message
Go Bot (go-bot) wrote :

The attempt to merge lp:~dave-cheney/juju-core/178-update-errgo-and-loggo-dependencies into lp:juju-core failed. Below is the output from the failed tests.

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

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

The attempt to merge lp:~dave-cheney/juju-core/178-update-errgo-and-loggo-dependencies into lp:juju-core failed. Below is the output from the failed tests.

"/home/tarmac/trees/src/github.com/juju/loggo" now at 7e8c70b24b80b95b2284f09306aac0bd93588db8

godeps: cannot update "/home/tarmac/trees/src/github.com/juju/errgo": fatal: reference is not a tree: 26caa7d4884f6048c5687fa44c410e5d5d95e554
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-18 23:12:12 +0000
3+++ dependencies.tsv 2014-05-21 01:18:51 +0000
4@@ -4,9 +4,9 @@
5 github.com/joyent/gomanta git ff785814c0ebb4050420a2f1d47895b35b8808f2
6 github.com/joyent/gosdc git 10bbe92c5d98c8b38a0b7f62ee042c7252150efc
7 github.com/joyent/gosign git 476720af5427223da5420afbbadf620bfb760345
8-github.com/juju/errgo git f6b8bbf169635df7d536aef8bd14e808cf28c6db
9+github.com/juju/errgo git 26caa7d4884f6048c5687fa44c410e5d5d95e554
10 github.com/juju/errors git 075df0417dbcc39d24ee18248d2f8d6e3eed598b
11-github.com/juju/loggo git fa3acf9ab9ed09aea29030558528e24a254d27af
12+github.com/juju/loggo git 7e8c70b24b80b95b2284f09306aac0bd93588db8
13 github.com/juju/ratelimit git 0025ab75db6c6eaa4ffff0240c2c9e617ad1a0eb
14 github.com/juju/testing git 9c0e0686136637876ae659e9056897575236e11f
15 labix.org/v2/mgo bzr gustavo@niemeyer.net-20140331185009-fhnh3xzfdpicup0j 273

Subscribers

People subscribed via source and target branches

to status/vote changes: