# HG changeset patch
# User Jon VanAlten <jon.vanalten@redhat.com>
# Date 1360122660 18000
# Node ID 3a1d50cfcbb7336e6db3f8e8391ce61061404a57
# Parent  228ad727f418dd36b41737408a4480bfcc9bd2c6
Fix conflicts among short options
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-February/005499.html
Reviewed-by: omajid

diff -r 228ad727f418 -r 3a1d50cfcbb7 distribution/config/commands/dump-heap.properties
--- 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
diff -r 228ad727f418 -r 3a1d50cfcbb7 distribution/config/commands/list-heap-dumps.properties
--- 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
diff -r 228ad727f418 -r 3a1d50cfcbb7 distribution/config/commands/vm-info.properties
--- 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
diff -r 228ad727f418 -r 3a1d50cfcbb7 distribution/config/commands/vm-stat.properties
--- 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