← Back to branch summary

~gz/juju-core/os_listservers_errors_1222413

~gz/juju-core/os_listservers_errors_1222413

Viewing all changes in revision 2683.

Committer: Tarmac
Author(s): Curtis Hovey, John Arbash Meinel, Nate Finch
Date: 2014-04-25 15:23:36 UTC
mfrom: (2682.1.2 1.19-merges-1.18)
Revision ID: tarmac-20140425152336-wcons0xo07oslf6g

Tags: juju-1.19.1

[r=jameinel] merge 1.18 into trunk

Brings bug fix #1312136 and #1312537. (Fix apiConfigConnect and rename authorised-keys to authorized-keys)

files renamed:
cmd/juju/authorisedkeys.go => cmd/juju/authorizedkeys.go

cmd/juju/authorisedkeys_add.go => cmd/juju/authorizedkeys_add.go

cmd/juju/authorisedkeys_delete.go => cmd/juju/authorizedkeys_delete.go

cmd/juju/authorisedkeys_import.go => cmd/juju/authorizedkeys_import.go

cmd/juju/authorisedkeys_list.go => cmd/juju/authorizedkeys_list.go

cmd/juju/authorisedkeys_test.go => cmd/juju/authorizedkeys_test.go

files modified:
cmd/juju/help_topics.go

cmd/juju/main.go

cmd/juju/main_test.go

cmd/supercommand.go

cmd/supercommand_test.go

juju/api.go

juju/apiconn_test.go

juju/export_test.go

Show diffs side-by-side

added added

removed removed

cmd/juju/authorizedkeys.go

cmd/juju/authorizedkeys_add.go

cmd/juju/authorizedkeys_delete.go

cmd/juju/authorizedkeys_import.go

cmd/juju/authorizedkeys_list.go

cmd/juju/authorizedkeys_test.go

cmd/juju/help_topics.go

cmd/juju/main.go

cmd/juju/main_test.go

cmd/supercommand.go

cmd/supercommand_test.go

juju/apiconn_test.go

juju/export_test.go

Older »