From 4976404770931a11369101e8ed17aecdea13de7b Mon Sep 17 00:00:00 2001
From: Selvasundaram <selvam@gluster.com>
Date: Thu, 28 Jul 2011 12:46:14 +0530
Subject: Add only the online gluster servers to discovered servers while
 removing

---
 .../storage/management/gui/GlusterDataModelManager.java      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java
index e19645a5..017549de 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java
@@ -668,11 +668,13 @@ public class GlusterDataModelManager {
 			listener.serverRemoved(server);
 		}
 		
-		// add it to discovered servers list
-		Server removedServer = new Server();
-		removedServer.copyFrom(server);
-		removedServer.addDisks(server.getDisks());
-		addDiscoveredServer(removedServer);
+		// add it to discovered servers list if it is online server
+		if (server.isOnline()) {
+			Server removedServer = new Server();
+			removedServer.copyFrom(server);
+			removedServer.addDisks(server.getDisks());
+			addDiscoveredServer(removedServer);
+		}
 	}
 
 	public void deleteVolume(Volume volume) {
-- 
cgit 


From 3083315feff6f57f9c0b58ee05370fd73aa2ff04 Mon Sep 17 00:00:00 2001
From: Selvasundaram <selvam@gluster.com>
Date: Thu, 28 Jul 2011 14:16:59 +0530
Subject: Bug 2885 - "Add" button gets disabled after resetting volume options
 with any option without value - fix

---
 .../gluster/storage/management/gui/views/pages/VolumeOptionsPage.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumeOptionsPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumeOptionsPage.java
index 69434e96..d8b8387e 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumeOptionsPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/VolumeOptionsPage.java
@@ -139,6 +139,8 @@ public class VolumeOptionsPage extends Composite {
 				switch (event.getEventType()) {
 				case VOLUME_OPTIONS_RESET:
 					if (!tableViewer.getControl().isDisposed()) {
+						//While reseting the options, clear the filter text before refreshing the tree
+						filterText.setText("");  
 						tableViewer.refresh();
 						setAddButtonsEnabled(true);
 					}
-- 
cgit