rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-10-21 23:58:06 +00:00
Code Issues Releases Wiki Activity

Merge pull request #197 from cloudnautique/fix_ssh_key_merge

Browse Source 
Needed to add a newline.
This commit is contained in:
Darren Shepherd
2015-04-17 00:50:30 -07:00
parent ae0c42cef3 1ab2b502dd
commit fd0ec5bc19
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/cloudinit/gce.go
View File

@@ -36,7 +36,7 @@ func NewGceCloudConfig() *GceCloudConfig {
log.Errorf("Could not retrieve instance SSH Keys: %s", err) log.Errorf("Could not retrieve instance SSH Keys: %s", err)
} }
nonUserDataSSHKeysRaw := projectSSHKeys + instanceSSHKeys nonUserDataSSHKeysRaw := projectSSHKeys + "\n" + instanceSSHKeys
nonUserDataSSHKeys := gceSshKeyFormatter(nonUserDataSSHKeysRaw) nonUserDataSSHKeys := gceSshKeyFormatter(nonUserDataSSHKeysRaw)
gceCC := &GceCloudConfig{ gceCC := &GceCloudConfig{