summaryrefslogtreecommitdiffstats
path: root/src/com.gluster.storage.management.client
diff options
context:
space:
mode:
authorDhandapani <dhandapani@gluster.com>2011-07-07 17:55:05 +0530
committerDhandapani <dhandapani@gluster.com>2011-07-07 17:55:05 +0530
commit33795a983d4196d208faa9a376e85a61dcf80688 (patch)
tree7097a92d4c54522b5898601740baa27d04f90fa8 /src/com.gluster.storage.management.client
parent3ac28ddf3531d2dd1914533d83a393359e9307b7 (diff)
parent5e04ff19a21ed84aa59004bb8040e1a0d6734542 (diff)
Merge branch 'master' of git@github.com:gluster/console
Diffstat (limited to 'src/com.gluster.storage.management.client')
-rw-r--r--src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java2
-rw-r--r--src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
index 8027473b..9ee4513c 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
@@ -646,7 +646,7 @@ public class GlusterDataModelManager {
public void removeTask(TaskInfo taskInfo) {
model.getCluster().removeTaskInfo(taskInfo);
for (ClusterListener listener : listeners) {
- listener.taskAdded(taskInfo);
+ listener.taskRemoved(taskInfo);
}
}
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java
index 7beb8433..3435b2e1 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java
@@ -232,13 +232,13 @@ public class VolumesClient extends AbstractClient {
return putRequestURI(volumeName + "/" + RESTConstants.RESOURCE_BRICKS, form);
}
- public void rebalanceStart(String volumeName, Boolean fixLayout, Boolean migrateData, Boolean forcedDataMigrate) {
+ public URI rebalanceStart(String volumeName, Boolean fixLayout, Boolean migrateData, Boolean forcedDataMigrate) {
Form form = new Form();
form.add(RESTConstants.FORM_PARAM_OPERATION, RESTConstants.TASK_REBALANCE_START);
form.add(RESTConstants.FORM_PARAM_FIX_LAYOUT, fixLayout);
form.add(RESTConstants.FORM_PARAM_MIGRATE_DATA, migrateData);
form.add(RESTConstants.FORM_PARAM_FORCED_DATA_MIGRATE, forcedDataMigrate);
- putRequest(volumeName, form);
+ return putRequestURI(volumeName, form);
}
public void rebalanceStop(String volumeName) {