Merge lp:~mattyw/juju-core/1191066 into lp:~go-bot/juju-core/trunk

[Matthew Williams]

Bug fix for lp:1191066. juju ssh doc change: juju ssh can take a unit name rather than a service name, also agent. was making gofmt sad

Bug fix for lp:1191066

juju ssh can take a unit name rather than a service name, also agent. was making gofmt sad

https://codereview.appspot.com/10683043/

[Matthew Williams (mattyw)]

Reviewers: mp+171782_code.launchpad.net,

Message:
Please take a look.

Description:
Bug fix for lp:1191066

juju ssh can take a unit name rather than a service name, also agent.
was making gofmt sad

https://code.launchpad.net/~mattyw/juju-core/1191066/+merge/171782

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M cmd/juju/ssh.go
   M cmd/jujud/agent.go

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-20130627113211-1fh1aiobalx7tfwk
+New revision: <email address hidden>

Index: cmd/juju/ssh.go
=== modified file 'cmd/juju/ssh.go'
--- cmd/juju/ssh.go 2013-06-16 23:07:00 +0000
+++ cmd/juju/ssh.go 2013-06-27 12:00:29 +0000
@@ -29,7 +29,7 @@

  const sshDoc = `
  Launch an ssh shell on the machine identified by the <service> parameter.
-<service> can be either a machine id or a service name. Any extra
parameters
+<service> can be either a machine id or a unit name. Any extra parameters
  are treated as extra parameters for the ssh command.
  `

Index: cmd/jujud/agent.go
=== modified file 'cmd/jujud/agent.go'
--- cmd/jujud/agent.go 2013-06-27 09:26:02 +0000
+++ cmd/jujud/agent.go 2013-06-27 12:02:03 +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 {

[John A Meinel (jameinel)]

LGTM

https://codereview.appspot.com/10683043/

[Dimiter Naydenov (dimitern)]

LGTM, but please link the MP to the bug.

https://codereview.appspot.com/10683043/

=== modified file 'cmd/juju/ssh.go'
--- cmd/juju/ssh.go	2013-06-16 23:07:00 +0000
+++ cmd/juju/ssh.go	2013-06-27 12:09:26 +0000
@@ -29,7 +29,7 @@
 
 const sshDoc = `
 Launch an ssh shell on the machine identified by the <service> parameter.
-<service> can be either a machine id or a service name.  Any extra parameters
+<service> can be either a machine id or a unit name.  Any extra parameters
 are treated as extra parameters for the ssh command.
 `
 

=== modified file 'cmd/jujud/agent.go'
--- cmd/jujud/agent.go	2013-06-27 09:26:02 +0000
+++ cmd/jujud/agent.go	2013-06-27 12:09:26 +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 {