[2/2] git commit: updated refs/heads/master to 431389d

[bh...@apache.org]

Merge pull request #1044 from ustcweizhou/keep-sshkey

CLOUDSTACK-5822: keep user-added sshkeys in authorized_keysFor now, if we add the ssh key inside the vm (not on cloudstack UI), the sshkey will be removed if we reset the sshkey on cloudstack UI.

After this commit, the sshkey (added by cloudstack) will end with cloudstack@apache.org.
We will only control the sshkeys with cloudstack@apache.org.

This will be used for multiple sshkey support for vm in the future.

* pr/1044:
  CLOUDSTACK-5822: keep user-added sshkeys in authorized_keys

Signed-off-by: Rohit Yadav <ro...@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/431389da
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/431389da
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/431389da

Branch: refs/heads/master
Commit: 431389da9d81034729ed06c98cf06d0fd0c3c66b
Parents: a59cf68 64ef4fa
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Jan 27 16:12:06 2016 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Jan 27 16:12:06 2016 +0100

----------------------------------------------------------------------
 setup/bindir/cloud-set-guest-sshkey.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------