diff options
| author | Selvasundaram <selvam@gluster.com> | 2011-07-04 19:06:51 +0530 |
|---|---|---|
| committer | Selvasundaram <selvam@gluster.com> | 2011-07-04 19:06:51 +0530 |
| commit | f9ddc60ee998d24ff1f2b5f158a2b0e14f965b0d (patch) | |
| tree | 6efef62ed2b7fd7791cb6016cfbf2ddfaa58479f /src/com.gluster.storage.management.gui | |
| parent | 552e7c7f05bfd553c9d539926f4aca0f08c5c246 (diff) | |
| parent | 2710aaba814aeac87cc7d83a45c066ab7b7a164e (diff) | |
Merge branch 'master' of github.com:gluster/console
Conflicts:
src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/Task.java
Diffstat (limited to 'src/com.gluster.storage.management.gui')
2 files changed, 3 insertions, 3 deletions
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddServerAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddServerAction.java index 0e6cd6b2..81661942 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddServerAction.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddServerAction.java @@ -53,7 +53,6 @@ public class AddServerAction extends AbstractActionDelegate { try { glusterServersClient.addServer(server); - modelManager.removeDiscoveredServer(server); modelManager.addGlusterServer(glusterServersClient.getGlusterServer(server.getName())); successServers.add(server); } catch (Exception e) { diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RefreshDataAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RefreshDataAction.java index 4a569c50..fe358caa 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RefreshDataAction.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RefreshDataAction.java @@ -20,6 +20,8 @@ package com.gluster.storage.management.gui.actions; import org.eclipse.jface.action.IAction; +import com.gluster.storage.management.client.GlusterDataModelManager; + /** * */ @@ -39,7 +41,6 @@ public class RefreshDataAction extends AbstractActionDelegate { */ @Override protected void performAction(IAction action) { - // TODO Auto-generated method stub - + GlusterDataModelManager.getInstance().refreshModel(); } } |