Merge lp:~dave-cheney/juju-core/122-tag-release-1.11.1 into lp:~go-bot/juju-core/trunk

[Dave Cheney]

Tag release-1.11.1

lbox can't handle this flava.

Tag release-1.11.1

lbox can't handle this flava.

[Tim Penhey (thumper)]

review: Approve

=== modified file 'cmd/jujud/agent.go'
--- cmd/jujud/agent.go	2013-06-27 09:26:02 +0000
+++ cmd/jujud/agent.go	2013-06-28 02:30:36 +0000
@@ -143,7 +143,7 @@
 	// We let the API dial fail immediately because the
 	// runner's loop outside the caller of openAPIState will
 	// keep on retrying. If we block for ages here,
-	// then the worker that's calling this cannot 
+	// then the worker that's calling this cannot
 	// be interrupted.
 	st, newPassword, err := c.OpenAPI(api.DialOpts{})
 	if err != nil {

=== modified file 'worker/resumer/resumer_test.go'
--- worker/resumer/resumer_test.go	2013-06-27 17:59:44 +0000
+++ worker/resumer/resumer_test.go	2013-06-28 02:30:36 +0000
@@ -46,7 +46,7 @@
 
 	// Check that a numner of calls has happened with a time
 	// difference somewhere between the interval and twice the
-	// interval. A more precise time behavior cannot be 
+	// interval. A more precise time behavior cannot be
 	// specified due to the load during the test.
 	c.Assert(len(tr.timestamps) > 0, Equals, true)
 	for i := 1; i < len(tr.timestamps); i++ {