summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDhandapani <dhandapani@gluster.com>2011-12-09 17:26:13 +0530
committerDhandapani <dhandapani@gluster.com>2011-12-09 17:26:13 +0530
commit638cebcf4433b12cf6ba29a4ec3964ef55edf1e6 (patch)
treeef8b6923493da5b8e432ebdf3bc76c78debcd2f9
parent99308c132d8c50ffa852bc5c5510e526e52a00d1 (diff)
parent36eefad9f86737c6e06886db8eb0302e4c51cd9b (diff)
Merge branch 'work'
Conflicts: src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RebalanceVolumeAction.java src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/MigrateBrickWizard.java
-rw-r--r--src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RebalanceVolumeAction.java5
-rw-r--r--src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/MigrateBrickWizard.java5
2 files changed, 4 insertions, 6 deletions
diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RebalanceVolumeAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RebalanceVolumeAction.java
index 2af6397..4e1d712 100644
--- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RebalanceVolumeAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RebalanceVolumeAction.java
@@ -55,9 +55,8 @@ public class RebalanceVolumeAction extends AbstractActionDelegate {
GlusterDataModelManager.getInstance().addTask(taskInfo);
}
if (taskInfo.getStatus().getCode() == Status.STATUS_CODE_ERROR) {
- showInfoDialog(actionDesc, "Volume [" + volume.getName()
- + "] rebalance started, but following error occured [" + taskInfo.getStatus().getMessage()
- + "]");
+ showWarningDialog(actionDesc, "Volume [" + volume.getName()
+ + "] rebalance started, but following error occured: " + taskInfo.getStatus());
} else {
showInfoDialog(actionDesc, "Volume [" + volume.getName() + "] rebalance started successfully!");
}
diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/MigrateBrickWizard.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/MigrateBrickWizard.java
index c530ba0..51d5e1d 100644
--- a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/MigrateBrickWizard.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/MigrateBrickWizard.java
@@ -98,9 +98,8 @@ public class MigrateBrickWizard extends Wizard {
if (taskInfo.getStatus().getCode() == TaskStatus.STATUS_CODE_RUNNING) {
MessageDialog.openInformation(getShell(), dialogTitle, "Brick migration started successfully");
} else {
- MessageDialog.openInformation(getShell(), dialogTitle,
- "Brick migration started, but following error occured [" + taskInfo.getStatus().getMessage()
- + "]");
+ MessageDialog.openWarning(getShell(), dialogTitle,
+ "Brick migration started, but following error occured: " + taskInfo.getStatus());
}
GUIHelper.getInstance().showTaskView();