juju-core

Merge lp:~sinzui/juju-core/goyaml-50-deps into lp:~go-bot/juju-core/trunk

  1. goyaml-50-deps
  2. Merge into trunk
Proposed by Curtis Hovey
Status: Merged
Approved by: Curtis Hovey
Approved revision: no longer in the source branch.
Merged at revision: 2067
Proposed branch: lp:~sinzui/juju-core/goyaml-50-deps
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:~sinzui/juju-core/goyaml-50-deps
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+195428@code.launchpad.net

Commit message

Restore YAML block and flow interpretation.

Update the goyaml dep to r50 so that --- and ... can have text following them.

Description of the change

Restore YAML block and flow interpretation.

Update the goyaml dep to r50 so that --- and ... can have text following them.

I verified dependencies.tsv with
    godeps -u dependencies.tsv

https://codereview.appspot.com/26960043/

To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :

Reviewers: mp+195428_code.launchpad.net,

Message:
Please take a look.

Description:
Restore YAML block and flow interpretation.

Update the goyaml dep to r50 so that --- and ... can have text
following them.

I verified dependencies.tsv with
     godeps -u dependencies.tsv

https://code.launchpad.net/~sinzui/juju-core/goyaml-50-deps/+merge/195428

(do not edit description out of merge proposal)

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

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-20131115152216-393eaqgqwsnw9q7o
+New revision: <email address hidden>

Index: dependencies.tsv
=== modified file 'dependencies.tsv'
--- dependencies.tsv 2013-11-14 15:08:13 +0000
+++ dependencies.tsv 2013-11-15 17:19:43 +0000
@@ -7,7 +7,7 @@
  launchpad.net/golxc bzr
<email address hidden> 5
  launchpad.net/gomaasapi bzr
<email address hidden> 47
  launchpad.net/goose bzr tarmac-20131101034733-zbirap24k6k8wjlg 110
-launchpad.net/goyaml bzr
<email address hidden> 49
+launchpad.net/goyaml bzr
<email address hidden> 50
  launchpad.net/gwacl bzr tarmac-20131031081035-b33m6fyrrdiuf408 229
  launchpad.net/loggo bzr
<email address hidden> 39
  launchpad.net/lpad bzr
<email address hidden> 64

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

On 2013/11/15 17:27:36, curtis wrote:
> Please take a look.

LGTM

https://codereview.appspot.com/26960043/

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-11-14 15:08:13 +0000
3+++ dependencies.tsv 2013-11-15 17:26:50 +0000
4@@ -7,7 +7,7 @@
5 launchpad.net/golxc bzr frank.mueller@canonical.com-20130617094614-jelomk87defuetol 5
6 launchpad.net/gomaasapi bzr ian.booth@canonical.com-20131017011445-m1hmr0ap14osd7li 47
7 launchpad.net/goose bzr tarmac-20131101034733-zbirap24k6k8wjlg 110
8-launchpad.net/goyaml bzr john@arbash-meinel.com-20131114054309-r23l23rhp28jmqip 49
9+launchpad.net/goyaml bzr gustavo@niemeyer.net-20131114120802-abe042syx64z2m7s 50
10 launchpad.net/gwacl bzr tarmac-20131031081035-b33m6fyrrdiuf408 229
11 launchpad.net/loggo bzr tim.penhey@canonical.com-20130729043644-ym0cscir1cist4sm 39
12 launchpad.net/lpad bzr gustavo@niemeyer.net-20120626194701-536yx0g9jdq2ik3h 64

Subscribers

People subscribed via source and target branches

to status/vote changes: