juju-core

Merge lp:~dave-cheney/juju-core/123-set-development-version-to-1.11.2 into lp:~go-bot/juju-core/trunk

  1. 123-set-development-version-to-1.11.2
  2. Merge into trunk
Proposed by Dave Cheney
Status: Merged
Approved by: Dave Cheney
Approved revision: no longer in the source branch.
Merged at revision: 1354
Proposed branch: lp:~dave-cheney/juju-core/123-set-development-version-to-1.11.2
Merge into: lp:~go-bot/juju-core/trunk
Diff against target: 38 lines (+3/-3)
3 files modified
cmd/jujud/agent.go (+1/-1)
version/version.go (+1/-1)
worker/resumer/resumer_test.go (+1/-1)
To merge this branch: bzr merge lp:~dave-cheney/juju-core/123-set-development-version-to-1.11.2
Reviewer Review Type Date Requested Status
Tim Penhey (community) Approve
Review via email: mp+171946@code.launchpad.net

Commit message

version: set development version to 1.11.2

Description of the change

version: set development version to 1.11.2

Also, gofmt

https://codereview.appspot.com/10725044/

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :

LGTM - trivial

https://codereview.appspot.com/10725044/

Revision history for this message
Tim Penhey (thumper) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmd/jujud/agent.go'
2--- cmd/jujud/agent.go 2013-06-27 09:26:02 +0000
3+++ cmd/jujud/agent.go 2013-06-28 01:39:25 +0000
4@@ -143,7 +143,7 @@
5 // We let the API dial fail immediately because the
6 // runner's loop outside the caller of openAPIState will
7 // keep on retrying. If we block for ages here,
8- // then the worker that's calling this cannot
9+ // then the worker that's calling this cannot
10 // be interrupted.
11 st, newPassword, err := c.OpenAPI(api.DialOpts{})
12 if err != nil {
13
14=== modified file 'version/version.go'
15--- version/version.go 2013-05-28 01:45:00 +0000
16+++ version/version.go 2013-06-28 01:39:25 +0000
17@@ -20,7 +20,7 @@
18 // The presence and format of this constant is very important.
19 // The debian/rules build recipe uses this value for the version
20 // number of the release package.
21-const version = "1.11.1"
22+const version = "1.11.2"
23
24 // CurrentNumber returns the version number.
25 func CurrentNumber() Number {
26
27=== modified file 'worker/resumer/resumer_test.go'
28--- worker/resumer/resumer_test.go 2013-06-27 17:59:44 +0000
29+++ worker/resumer/resumer_test.go 2013-06-28 01:39:25 +0000
30@@ -46,7 +46,7 @@
31
32 // Check that a numner of calls has happened with a time
33 // difference somewhere between the interval and twice the
34- // interval. A more precise time behavior cannot be
35+ // interval. A more precise time behavior cannot be
36 // specified due to the load during the test.
37 c.Assert(len(tr.timestamps) > 0, Equals, true)
38 for i := 1; i < len(tr.timestamps); i++ {

Subscribers

People subscribed via source and target branches

to status/vote changes: