summaryrefslogtreecommitdiffstats
path: root/src/com.gluster.storage.management.gui/plugin.xml
diff options
context:
space:
mode:
authorSelvasundaram <selvam@gluster.com>2011-07-04 19:20:26 +0530
committerSelvasundaram <selvam@gluster.com>2011-07-04 19:20:26 +0530
commitc2d7de50f8e54c85e53dc8803a8100d6711d1bb1 (patch)
treea9a9bf318c02d6b1bc4152b7f63a3e54f91f456c /src/com.gluster.storage.management.gui/plugin.xml
parentf9ddc60ee998d24ff1f2b5f158a2b0e14f965b0d (diff)
parent45ca89a241e826d80802d9e3e93d28f8cd026316 (diff)
Merge branch 'tasks'
Conflicts: src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddBrickAction.java src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/CommitTaskAction.java src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/MigrateBrickTask.java src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java
Diffstat (limited to 'src/com.gluster.storage.management.gui/plugin.xml')
-rw-r--r--src/com.gluster.storage.management.gui/plugin.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com.gluster.storage.management.gui/plugin.xml b/src/com.gluster.storage.management.gui/plugin.xml
index 5b18421f..b0dfa9a9 100644
--- a/src/com.gluster.storage.management.gui/plugin.xml
+++ b/src/com.gluster.storage.management.gui/plugin.xml
@@ -476,7 +476,7 @@
visible="false">
<action
allowLabelUpdate="false"
- class="com.gluster.storage.management.gui.actions.MigrateDiskAction"
+ class="com.gluster.storage.management.gui.actions.MigrateBrickAction"
definitionId="com.gluster.storage.management.gui.commands.MigrateDisk"
icon="icons/disk-migrate.png"
id="com.gluster.storage.management.gui.actions.MigrateDiskAction"
@@ -593,7 +593,7 @@
</action>
<action
allowLabelUpdate="false"
- class="com.gluster.storage.management.gui.actions.RemoveDiskAction"
+ class="com.gluster.storage.management.gui.actions.RemoveBrickAction"
definitionId="com.gluster.storage.management.gui.commands.RemoveDisk"
icon="icons/disk.png"
id="com.gluster.storage.management.gui.actions.RemoveDiskAction"
@@ -609,7 +609,7 @@
</action>
<action
allowLabelUpdate="false"
- class="com.gluster.storage.management.gui.actions.AddDiskAction"
+ class="com.gluster.storage.management.gui.actions.AddBrickAction"
definitionId="com.gluster.storage.management.gui.commands.AddDisk"
icon="icons/disk.png"
id="com.gluster.storage.management.gui.actions.AddDiskAction"
@@ -659,7 +659,7 @@
definitionId="com.gluster.storage.management.gui.commands.Commit"
icon="icons/stop.png"
id="com.gluster.storage.management.gui.actions.Commit"
- label="&amp;Commit TaskTask"
+ label="&amp;Commit Task"
menubarPath="com.gluster.storage.management.gui.menu.cluster/cluster"
mode="FORCE_TEXT"
pulldown="false"
@@ -1206,7 +1206,7 @@
objectClass="com.gluster.storage.management.core.model.Volume">
<action
allowLabelUpdate="false"
- class="com.gluster.storage.management.gui.actions.MigrateDiskAction"
+ class="com.gluster.storage.management.gui.actions.MigrateBrickAction"
definitionId="com.gluster.storage.management.gui.commands.MigrateDisk"
enablesFor="1"
icon="icons/disk-migrate.png"