Merge lp://staging/~jameinel/juju-core/1.16-remove-service-1261628 into lp://staging/juju-core/1.16
Status: | Merged |
---|---|
Approved by: | John A Meinel |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2001 |
Proposed branch: | lp://staging/~jameinel/juju-core/1.16-remove-service-1261628 |
Merge into: | lp://staging/juju-core/1.16 |
Diff against target: |
38 lines (+4/-1) 3 files modified
cmd/juju/destroymachine.go (+1/-1) cmd/juju/destroyservice.go (+1/-0) cmd/juju/main_test.go (+2/-0) |
To merge this branch: | bzr merge lp://staging/~jameinel/juju-core/1.16-remove-service-1261628 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju Engineering | Pending | ||
Review via email: mp+199221@code.staging.launchpad.net |
Commit message
cmd/juju: alias remove-service and remove-machine
Part of bug #1261628, this lets us document 'remove-*' as the
preferred syntax for operations, since they aren't quite as "scary" as
'destroy-*'.
This is targetting 1.16 so that we can start documenting their use (in
a stable release). In trunk we could then actually rename the command
and have the old name as the alias. (So the command is
'remove-machine' with an alias of 'destroy-machine' for compatibility
purposes.)
Description of the change
cmd/juju: alias remove-service and remove-machine
Part of bug #1261628, this lets us document 'remove-*' as the
preferred syntax for operations, since they aren't quite as "scary" as
'destroy-*'.
This is targetting 1.16 so that we can start documenting their use (in
a stable release). In trunk we could then actually rename the command
and have the old name as the alias. (So the command is
'remove-machine' with an alias of 'destroy-machine' for compatibility
purposes.)
Reviewers: mp+199221_ code.launchpad. net,
Message:
Please take a look.
Description:
cmd/juju: alias remove-service and remove-machine
Part of bug #1261628, this lets us document 'remove-*' as the
preferred syntax for operations, since they aren't quite as "scary" as
'destroy-*'.
This is targetting 1.16 so that we can start documenting their use (in
a stable release). In trunk we could then actually rename the command
and have the old name as the alias. (So the command is
'remove-machine' with an alias of 'destroy-machine' for compatibility
purposes.)
https:/ /code.launchpad .net/~jameinel/ juju-core/ 1.16-remove- service- 1261628/ +merge/ 199221
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/40650048/
Affected files (+6, -1 lines): destroymachine. go destroyservice. go main_test. go
A [revision details]
M cmd/juju/
M cmd/juju/
M cmd/juju/
Index: [revision details] 20131212080047- vjisba431m6q5we 8
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-
+New revision: <email address hidden>
Index: cmd/juju/ destroymachine. go destroymachine. go' destroymachine. go 2013-11-27 12:14:31 +0000 destroymachine. go 2013-12-17 06:10:04 +0000 "terminate- machine" }, "remove- machine" , "terminate- machine" },
=== modified file 'cmd/juju/
--- cmd/juju/
+++ cmd/juju/
@@ -37,7 +37,7 @@
Args: "<machine> ...",
Purpose: "destroy machines",
Doc: destroyMachineDoc,
- Aliases: []string{
+ Aliases: []string{
}
}
Index: cmd/juju/ destroyservice. go destroyservice. go' destroyservice. go 2013-08-13 19:07:35 +0000 destroyservice. go 2013-12-17 06:10:04 +0000 "remove- service" },
=== modified file 'cmd/juju/
--- cmd/juju/
+++ cmd/juju/
@@ -25,6 +25,7 @@
Args: "<service>",
Purpose: "destroy a service",
Doc: "Destroying a service will destroy all its units and
relations.",
+ Aliases: []string{
}
}
Index: cmd/juju/ main_test. go main_test. go' main_test. go 2013-10-10 15:08:27 +0000 main_test. go 2013-12-17 06:10:04 +0000 relation" , // alias for destroy-relation
=== modified file 'cmd/juju/
--- cmd/juju/
+++ cmd/juju/
@@ -240,7 +240,9 @@
"help-tool",
"init",
"publish",
+ "remove-machine", // alias for destroy-machine
"remove-
+ "remove-service", // alias for destroy-service
"remove-unit", // alias for destroy-unit
"resolved",
"scp",