Merge branch 'master' of git@github.com:Dhandapani/console

Conflicts:
	src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java
	src/com.gluster.storage.management.console/plugin.xml
	src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/VolumeLogRotateAction.java
	src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
	src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java

3 files changed, 3 insertions, 1 deletions

diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/VolumeLogRotateAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/VolumeLogRotateAction.java
index 2cef74b5..0e697b73 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/VolumeLogRotateAction.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/VolumeLogRotateAction.java
@@ -8,11 +8,13 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.ui.IWorkbenchPart;
 
 import com.gluster.storage.management.client.VolumesClient;
+import com.gluster.storage.management.console.actions.AbstractActionDelegate;
 import com.gluster.storage.management.console.utils.GUIHelper;
 import com.gluster.storage.management.console.views.VolumeBricksView;
 import com.gluster.storage.management.core.model.Brick;
 import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.core.utils.GlusterCoreUtil;
+import com.gluster.storage.management.core.utils.StringUtil;
 
 
 public class VolumeLogRotateAction extends AbstractActionDelegate {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
index 3db8bf90..22d7e3dc 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
@@ -69,6 +69,7 @@ public class RESTConstants {
 	public static final String FORM_PARAM_CIFS_ENABLE = "enableCifs";
 	public static final String FORM_PARAM_CIFS_USERS = "cifsUsers";
 	public static final String FORM_PARAM_CIFS_CONFIG = "cifsConfig";
+	public static final String FORM_PARAM_LOG_ROTATE = "logRotate";
 	
 	public static final String FORM_PARAM_CLUSTER_NAME = "clusterName";
 	public static final String FORM_PARAM_SERVER_NAME = "serverName";
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java
index b0894a5c..eaf99c9c 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java
@@ -706,7 +706,6 @@ public class VolumeService {
 		}
 	}
 	
-	
 	public void performVolumeOperation(String clusterName, String volumeName, String operation) {
 		GlusterServer onlineServer = clusterService.getOnlineServer(clusterName);
 		try {