Merge lp:~wallyworld/juju-core/golxc-dep-rev6 into lp:~go-bot/juju-core/trunk

[Ian Booth]

Update golxc dependency to rev 6

Update golxc dependency to rev 6

[Ian Booth (wallyworld)]

review: Approve

[Go Bot (go-bot)]

The attempt to merge lp:~wallyworld/juju-core/golxc-dep-rev6 into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core/agent 1.337s
ok launchpad.net/juju-core/agent/tools 0.256s
ok launchpad.net/juju-core/bzr 7.170s
ok launchpad.net/juju-core/cert 3.804s
ok launchpad.net/juju-core/charm 0.597s
? launchpad.net/juju-core/charm/hooks [no test files]
? launchpad.net/juju-core/charm/testing [no test files]
ok launchpad.net/juju-core/cloudinit 0.036s
ok launchpad.net/juju-core/cloudinit/sshinit 1.044s
ok launchpad.net/juju-core/cmd 0.241s
ok launchpad.net/juju-core/cmd/charm-admin 0.922s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/juju 213.879s
ok launchpad.net/juju-core/cmd/jujud 61.039s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 9.287s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/constraints 0.027s
ok launchpad.net/juju-core/container 0.037s
ok launchpad.net/juju-core/container/factory 0.053s
ok launchpad.net/juju-core/container/kvm 0.273s
ok launchpad.net/juju-core/container/kvm/mock 0.075s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 0.290s
? launchpad.net/juju-core/container/lxc/mock [no test files]
? launchpad.net/juju-core/container/lxc/testing [no test files]
? launchpad.net/juju-core/container/testing [no test files]
ok launchpad.net/juju-core/downloader 5.295s
ok launchpad.net/juju-core/environs 3.158s
ok launchpad.net/juju-core/environs/bootstrap 4.568s
ok launchpad.net/juju-core/environs/cloudinit 0.540s
ok launchpad.net/juju-core/environs/config 2.473s
ok launchpad.net/juju-core/environs/configstore 0.043s
ok launchpad.net/juju-core/environs/filestorage 0.033s
ok launchpad.net/juju-core/environs/httpstorage 1.084s
ok launchpad.net/juju-core/environs/imagemetadata 0.541s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.079s
ok launchpad.net/juju-core/environs/jujutest 0.268s
ok launchpad.net/juju-core/environs/manual 9.809s
ok launchpad.net/juju-core/environs/simplestreams 0.326s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 1.385s
ok launchpad.net/juju-core/environs/storage 1.272s
ok launchpad.net/juju-core/environs/sync 32.465s
ok launchpad.net/juju-core/environs/testing 0.192s
ok launchpad.net/juju-core/environs/tools 6.807s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.017s
ok launchpad.net/juju-core/instance 0.023s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/juju-core/juju 22.361s
ok launchpad.net/juju-core/juju/osenv 0.019s
? launchpad.net/juju-core/juju/testing [no test files]
ok launchpad.net/juju-core/log 0.015s
ok launchpad.net/juju-core/log/syslog 0.021s
ok launchpad.net/juju-core/names 0.026s
? launchpad.net/juju-core/...

=== modified file 'dependencies.tsv'
--- dependencies.tsv	2014-01-13 00:25:59 +0000
+++ dependencies.tsv	2014-01-22 01:39:02 +0000
@@ -4,7 +4,7 @@
 launchpad.net/gnuflag	bzr	[e-mail]-20121003093437-zcyyw0lpvj2nifpk	12
 launchpad.net/goamz	bzr	[e-mail]-20131218155244-hbnkvlkkzy3vmlh9	44
 launchpad.net/gocheck	bzr	[e-mail]-20130302024745-6ikofwq2c03h7giu	85
-launchpad.net/golxc	bzr	[e-mail]-20130617094614-jelomk87defuetol	5
+launchpad.net/golxc	bzr	[e-mail]-20140116225718-lvoikrb0me6zugin	6
 launchpad.net/gomaasapi	bzr	[e-mail]-20131017011445-m1hmr0ap14osd7li	47
 launchpad.net/goose	bzr	tarmac-20131223000240-y2igxjt3kznam7vi	114
 launchpad.net/goyaml	bzr	[e-mail]-20131114120802-abe042syx64z2m7s	50