Merge lp:~sinzui/juju-core/goyaml-dash-fix into lp:juju-core/1.16

[Curtis Hovey]

Backport the goyaml naked dash fix.

Update dependencies.tsv to get the latest version of goyaml which fixes
the naked dash problem

Backport the goyaml naked dash fix.

Update dependencies.tsv to get the latest version of goyaml which fixes
the naked dash problem. I verified this fix by running:
    godeps -u dependencies.tsv

https://codereview.appspot.com/26940043/

[Curtis Hovey (sinzui)]

Reviewers: mp+195410_code.launchpad.net,

Message:
Please take a look.

Description:
Backport the goyaml naked dash fix.

Update dependencies.tsv to get the latest version of goyaml which fixes
the naked dash problem. I verified this fix by running:
     godeps -u dependencies.tsv

https://code.launchpad.net/~sinzui/juju-core/goyaml-dash-fix/+merge/195410

(do not edit description out of merge proposal)

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

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-20131115114758-fdph6wugrsre3z1s
+New revision: <email address hidden>

Index: dependencies.tsv
=== modified file 'dependencies.tsv'
--- dependencies.tsv 2013-10-31 08:35:27 +0000
+++ dependencies.tsv 2013-11-15 15:35:08 +0000
@@ -7,7 +7,7 @@
  launchpad.net/golxc bzr
<email address hidden> 5
  launchpad.net/gomaasapi bzr tarmac-20130730082905-neqonnq9tk03ll8f 43
  launchpad.net/goose bzr tarmac-20130906034601-83yd6irnaucxwul4 105
-launchpad.net/goyaml bzr
<email address hidden> 47
+launchpad.net/goyaml bzr
<email address hidden> 49
  launchpad.net/gwacl bzr tarmac-20131031081035-b33m6fyrrdiuf408 229
  launchpad.net/loggo bzr
<email address hidden> 39
  launchpad.net/lpad bzr
<email address hidden> 64

[Roger Peppe (rogpeppe)]

On 2013/11/15 15:49:16, curtis wrote:
> Please take a look.

LGTM except i think it should probably use rev 50, not 49.

Thanks for making sure it works.

We should probably add a test case to trunk,
but that can happen later.

https://codereview.appspot.com/26940043/

[Go Bot (go-bot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Curtis Hovey (sinzui)]

LGTM was given for the update to 50.

[Go Bot (go-bot)]

The attempt to merge lp:~sinzui/juju-core/goyaml-dash-fix into lp:juju-core/1.16 failed. Below is the output from the failed tests.

ok launchpad.net/juju-core/agent 0.328s
ok launchpad.net/juju-core/agent/tools 0.245s
ok launchpad.net/juju-core/bzr 7.217s
ok launchpad.net/juju-core/cert 3.884s
ok launchpad.net/juju-core/charm 0.539s
? launchpad.net/juju-core/charm/hooks [no test files]
ok launchpad.net/juju-core/cloudinit 0.026s
ok launchpad.net/juju-core/cmd 0.207s
? 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 169.286s
ok launchpad.net/juju-core/cmd/jujud 47.641s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 2.353s
ok launchpad.net/juju-core/constraints 0.028s
ok launchpad.net/juju-core/container/lxc 0.307s
? launchpad.net/juju-core/container/lxc/mock [no test files]
ok launchpad.net/juju-core/downloader 5.291s
ok launchpad.net/juju-core/environs 3.145s
ok launchpad.net/juju-core/environs/bootstrap 5.052s
ok launchpad.net/juju-core/environs/cloudinit 0.565s
ok launchpad.net/juju-core/environs/config 0.742s
ok launchpad.net/juju-core/environs/configstore 0.040s
ok launchpad.net/juju-core/environs/filestorage 0.032s
ok launchpad.net/juju-core/environs/httpstorage 0.913s
ok launchpad.net/juju-core/environs/imagemetadata 0.477s
ok launchpad.net/juju-core/environs/instances 0.051s
ok launchpad.net/juju-core/environs/jujutest 0.315s
ok launchpad.net/juju-core/environs/manual 4.283s
ok launchpad.net/juju-core/environs/simplestreams 0.360s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 1.131s
ok launchpad.net/juju-core/environs/storage 1.171s
ok launchpad.net/juju-core/environs/sync 28.702s
ok launchpad.net/juju-core/environs/testing 0.244s
ok launchpad.net/juju-core/environs/tools 6.908s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.015s
ok launchpad.net/juju-core/instance 0.022s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/juju-core/juju 17.349s
ok launchpad.net/juju-core/juju/osenv 0.018s
? 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.023s
ok launchpad.net/juju-core/names 0.026s
? launchpad.net/juju-core/provider [no test files]
? launchpad.net/juju-core/provider/all [no test files]
ok launchpad.net/juju-core/provider/azure 6.406s
ok launchpad.net/juju-core/provider/common 0.324s
ok launchpad.net/juju-core/provider/dummy 21.833s
ok launchpad.net/juju-core/provider/ec2 5.589s
ok launchpad.net/juju-core/provider/ec2/httpstorage 0.210s
ok launchpad.net/juju-core/provider/local 2.315s
ok launchpad.net/juju-core/provider/maas 10.147s
ok launchpad.net/juju-core/provider/null 1.206s
ok launchpad.net/juju-core/provider/openstack 13.555s
ok launchpad.net/juju-core/rpc 0.082s
ok launchpad.net/juju-core/rpc/jsoncodec 0.028s
? launchpad.net/juju-core/rpc/rpcreflect [no test files]
ok ...

[Curtis Hovey (sinzui)]

This doesn't fail locally after rechecking that the deps are correct. LGTM.

review: Approve (code)

=== modified file 'dependencies.tsv'
--- dependencies.tsv	2013-10-31 08:35:27 +0000
+++ dependencies.tsv	2013-11-15 16:44:36 +0000
@@ -7,7 +7,7 @@
 launchpad.net/golxc	bzr	[e-mail]-20130617094614-jelomk87defuetol	5
 launchpad.net/gomaasapi	bzr	tarmac-20130730082905-neqonnq9tk03ll8f	43
 launchpad.net/goose	bzr	tarmac-20130906034601-83yd6irnaucxwul4	105
-launchpad.net/goyaml	bzr	[e-mail]-20130620163049-221erv1tss39x0xe	47
+launchpad.net/goyaml	bzr	[e-mail]-20131114120802-abe042syx64z2m7s	50
 launchpad.net/gwacl	bzr	tarmac-20131031081035-b33m6fyrrdiuf408	229
 launchpad.net/loggo	bzr	[e-mail]-20130729043644-ym0cscir1cist4sm	39
 launchpad.net/lpad	bzr	[e-mail]-20120626194701-536yx0g9jdq2ik3h	64