Skip to content

Commit 3affe5e

Browse files
nathanleclairenathanleclaire
committed
Merge pull request docker-archive-public#2391 from dgageot/update-dependencies-google
Update Google Driver dependencies
2 parents 4f4f20f + 865133a commit 3affe5e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+34521
-10744
lines changed

‎Godeps/Godeps.json‎

Lines changed: 15 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎drivers/google/compute_util.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,13 +261,15 @@ func (c *ComputeUtil) createInstance(d *Driver) error {
261261
if err != nil {
262262
return err
263263
}
264+
264265
log.Infof("Uploading SSH Key")
266+
metaDataValue := c.userName + ":" + string(sshKey) + "\n"
265267
op, err = c.service.Instances.SetMetadata(c.project, c.zone, c.instanceName, &raw.Metadata{
266268
Fingerprint: instance.Metadata.Fingerprint,
267269
Items: []*raw.MetadataItems{
268270
{
269271
Key: "sshKeys",
270-
Value: c.userName + ":" + string(sshKey) + "\n",
272+
Value: &metaDataValue,
271273
},
272274
},
273275
}).Do()

‎vendor/golang.org/x/crypto/curve25519/const_amd64.s‎

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/golang.org/x/crypto/curve25519/cswap_amd64.s‎

Lines changed: 88 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)