From 335038f55622e8541e35569ac7dd83763bc6bfa4 Mon Sep 17 00:00:00 2001 From: Dhandapani Date: Mon, 16 May 2011 12:16:28 +0530 Subject: Remove server comment fixes --- .../src/com/gluster/storage/management/client/AbstractClient.java | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src') 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 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" }) -- cgit