diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java index 0d22d3c6..d532c754 100644 --- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java +++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java @@ -217,13 +217,8 @@ public abstract class AbstractClient { }
@SuppressWarnings({ "unchecked", "rawtypes" })
-<<<<<<< HEAD:src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java - protected Object deleteResource(Class responseClass, String resourceName) {
- return resource.queryParam("serverName", resourceName).header(HTTP_HEADER_AUTH, authHeader).delete(responseClass);
-======= protected Object deleteResource(Class responseClass, MultivaluedMap<String, String> queryParams) {
return resource.queryParams(queryParams).header(HTTP_HEADER_AUTH, authHeader).delete(responseClass);
->>>>>>> remove-server:src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java }
@SuppressWarnings({ "unchecked", "rawtypes" })
|