diff options
| author | Dhandapani <dhandapani@gluster.com> | 2011-11-10 11:30:23 +0530 |
|---|---|---|
| committer | Dhandapani <dhandapani@gluster.com> | 2011-11-10 11:30:23 +0530 |
| commit | 8bb81c61ef59166fc227ed6548f5aa5617f1b79a (patch) | |
| tree | 30783fdf2b1308a69d6ed3d61c8a57c9dab40af4 /src | |
| parent | 949053f0c0b14576bd291769f4f2ddd06772cdc6 (diff) | |
| parent | 9d29863fecd8e21be5ff0dfc2835bc98302bc60a (diff) | |
Merge branch 'master' of git@github.com:Dhandapani/console
Conflicts:
src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/GlusterDataModelManager.java
src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DeleteVolumeAction.java
src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StopVolumeAction.java
src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServersSummaryView.java
src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumesSummaryView.java
src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ClusterListener.java
src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/DefaultClusterListener.java
Diffstat (limited to 'src')
2 files changed, 1 insertions, 5 deletions
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DeleteVolumeAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DeleteVolumeAction.java index 6d784676..b8376e4b 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DeleteVolumeAction.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DeleteVolumeAction.java @@ -127,10 +127,9 @@ public class DeleteVolumeAction extends AbstractMonitoredActionDelegate { } catch(Exception e2) { // force stop also failed. // Mark as deletion failed, append error message. - errorMessage += CoreConstants.NEWLINE + "Stop[" + volume.getName() + "] : [" + e2.getMessage() + errorMessage += CoreConstants.NEWLINE + "Stop [" + volume.getName() + "] : [" + e2.getMessage() + "]"; failedVolumes.add(volume); - // since we are not going to perform delete on this volume, // mark the deletion task as worked monitor.worked(1); diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StopVolumeAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StopVolumeAction.java index 3bd055f2..bbc0be47 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StopVolumeAction.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StopVolumeAction.java @@ -28,13 +28,10 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelection; import com.gluster.storage.management.client.VolumesClient; -import com.gluster.storage.management.console.AlertsManager; import com.gluster.storage.management.console.GlusterDataModelManager; import com.gluster.storage.management.console.IImageKeys; import com.gluster.storage.management.console.utils.GUIHelper; import com.gluster.storage.management.core.constants.CoreConstants; -import com.gluster.storage.management.core.model.Alert; -import com.gluster.storage.management.core.model.Alert.ALERT_TYPES; import com.gluster.storage.management.core.model.Volume; import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS; |