Mercurial > hg > release > thermostat-0.5
changeset 948:3a1d50cfcbb7
Fix conflicts among short options
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-February/005499.html
Reviewed-by: omajid
author | Jon VanAlten <jon.vanalten@redhat.com> |
---|---|
date | Tue, 05 Feb 2013 22:51:00 -0500 |
parents | 228ad727f418 |
children | ff1e3f5611b0 |
files | distribution/config/commands/dump-heap.properties distribution/config/commands/list-heap-dumps.properties distribution/config/commands/vm-info.properties distribution/config/commands/vm-stat.properties |
diffstat | 4 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/distribution/config/commands/dump-heap.properties Thu Jan 31 18:33:42 2013 +0100 +++ b/distribution/config/commands/dump-heap.properties Tue Feb 05 22:51:00 2013 -0500 @@ -30,7 +30,7 @@ hostId.required = true hostId.description = the ID of the host to monitor -vmId.short = p +vmId.short = v vmId.long = vmId vmId.hasarg = true vmId.required = true
--- a/distribution/config/commands/list-heap-dumps.properties Thu Jan 31 18:33:42 2013 +0100 +++ b/distribution/config/commands/list-heap-dumps.properties Tue Feb 05 22:51:00 2013 -0500 @@ -29,7 +29,7 @@ hostId.required = false hostId.description = the ID of the host to monitor -vmId.short = p +vmId.short = v vmId.long = vmId vmId.hasarg = true vmId.required = false
--- a/distribution/config/commands/vm-info.properties Thu Jan 31 18:33:42 2013 +0100 +++ b/distribution/config/commands/vm-info.properties Tue Feb 05 22:51:00 2013 -0500 @@ -23,7 +23,7 @@ hostId.required = true hostId.description = the ID of the host to monitor -vmId.short = p +vmId.short = v vmId.long = vmId vmId.hasarg = true vmId.required = false
--- a/distribution/config/commands/vm-stat.properties Thu Jan 31 18:33:42 2013 +0100 +++ b/distribution/config/commands/vm-stat.properties Tue Feb 05 22:51:00 2013 -0500 @@ -27,7 +27,7 @@ hostId.required = true hostId.description = the ID of the host to monitor -vmId.short = p +vmId.short = v vmId.long = vmId vmId.hasarg = true vmId.required = true