Merge lp:~jameinel/juju-core/1.18-authorized-keys-1312537 into lp:~go-bot/juju-core/trunk
Status: | Merged |
---|---|
Merged at revision: | 2683 |
Proposed branch: | lp:~jameinel/juju-core/1.18-authorized-keys-1312537 |
Merge into: | lp:~go-bot/juju-core/trunk |
Diff against target: |
422 lines (+81/-43) (has conflicts) 13 files modified
cmd/juju/authorizedkeys.go (+7/-6) cmd/juju/authorizedkeys_add.go (+1/-1) cmd/juju/authorizedkeys_delete.go (+1/-1) cmd/juju/authorizedkeys_import.go (+1/-1) cmd/juju/authorizedkeys_list.go (+2/-2) cmd/juju/authorizedkeys_test.go (+23/-23) cmd/juju/help_topics.go (+5/-5) cmd/juju/main.go (+2/-2) cmd/juju/main_test.go (+2/-1) cmd/supercommand.go (+6/-1) cmd/supercommand_test.go (+23/-0) scripts/win-installer/setup.iss (+4/-0) version/version.go (+4/-0) Text conflict in scripts/win-installer/setup.iss Text conflict in version/version.go |
To merge this branch: | bzr merge lp:~jameinel/juju-core/1.18-authorized-keys-1312537 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju Engineering | Pending | ||
Review via email:
|
Description of the change
rename authorised-keys to authorized-keys
This addresses bug #1312537. We were very inconsistent about whether
then name was "authorized-keys" or "authorised-keys". I can understand
the cultural spelling biasies. I originally intended to just alias the
command to 'authorized-keys' but then I realized the environments.yaml
setting is 'authorized-keys' so I felt it would be best to be consistent
with something we can't change at this point.
The patch was written against 1.18, so it should be trivial to land it
there, but I'm proposing it just against trunk to start with. We could
also do a more-trivial patch that just adds 'authorized-keys' as the
alias for 1.18, but it means that 'juju help authorized-keys' will tell
you the command is called 'authorised-keys' which I feel should change
in 1.19+.
Reviewers: mp+217174_ code.launchpad. net,
Message:
Please take a look.
Description:
rename authorised-keys to authorized-keys
This addresses bug #1312537. We were very inconsistent about whether
then name was "authorized-keys" or "authorised-keys". I can understand
the cultural spelling biasies. I originally intended to just alias the
command to 'authorized-keys' but then I realized the environments.yaml
setting is 'authorized-keys' so I felt it would be best to be consistent
with something we can't change at this point.
The patch was written against 1.18, so it should be trivial to land it
there, but I'm proposing it just against trunk to start with. We could
also do a more-trivial patch that just adds 'authorized-keys' as the
alias for 1.18, but it means that 'juju help authorized-keys' will tell
you the command is called 'authorised-keys' which I feel should change
in 1.19+.
https:/ /code.launchpad .net/~jameinel/ juju-core/ 1.18-authorized -keys-1312537/ +merge/ 217174
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/93800043/
Affected files (+77, -45 lines): authorizedkeys. go authorizedkeys_ add.go authorizedkeys_ delete. go authorizedkeys_ import. go authorizedkeys_ list.go authorizedkeys_ test.go help_topics. go main_test. go d_test. go win-installer/ setup.iss
A [revision details]
M cmd/juju/
M cmd/juju/
M cmd/juju/
M cmd/juju/
M cmd/juju/
M cmd/juju/
M cmd/juju/
M cmd/juju/main.go
M cmd/juju/
M cmd/supercommand.go
M cmd/supercomman
M scripts/
M version/version.go