Merge branch 'master' of github.com:gluster/console

Conflicts:
	src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java

2 files changed, 18 insertions, 12 deletions

diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/GlusterConstants.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/GlusterConstants.java
index f48f33cf..567eda61 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/GlusterConstants.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/GlusterConstants.java
@@ -31,4 +31,7 @@ public class GlusterConstants {
 	};
 
 	public static final List<String> VOLUME_LOG_LEVELS_ARR = StringUtil.enumToArray(VOLUME_LOG_LEVELS.values());
+	public static final String FSTYPE_EXT_3 = "ext3";
+	public static final String FSTYPE_EXT_4 = "ext4";
+	public static final String FSTYPE_XFS = "xfs";
 }
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/InitDiskStatusResponse.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/InitDiskStatusResponse.java
index 1a448606..6d1e83e3 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/InitDiskStatusResponse.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/InitDiskStatusResponse.java
@@ -20,19 +20,21 @@
  *******************************************************************************/
 package com.gluster.storage.management.core.model;
 
+import javax.xml.bind.annotation.XmlRootElement;
 
-public class InitDiskStatusResponse extends Status {
+@XmlRootElement
+public class InitDiskStatusResponse {
 
 	public enum FORMAT_STATUS {
 		IN_PROGRESS, COMPLETED, NOT_RUNNING
 	};
 
-	private String[] FORMAT_STATUS_STR = { "Inprogress", "Completed", "Notrunning" };
+	private String[] FORMAT_STATUS_STR = { "In Progress", "Completed", "Not Running" };
 
 	private String device;
 	private String message;
-	private float total;
-	private float completed;
+	private float totalBlocks;
+	private float completedBlocks;
 	private FORMAT_STATUS status;
 
 	public InitDiskStatusResponse() {
@@ -55,20 +57,21 @@ public class InitDiskStatusResponse extends Status {
 		this.message = message;
 	}
 	
-	public void setTotal(float total) {
-		this.total = total;
+
+	public void setTotalBlocks(float totalBlocks) {
+		this.totalBlocks = totalBlocks;
 	}
 
-	public float getTotal() {
-		return total;
+	public float getTotalBlocks() {
+		return totalBlocks;
 	}
 
-	public void setCompleted(float completed) {
-		this.completed = completed;
+	public void setCompletedBlocks(float completedBlocks) {
+		this.completedBlocks = completedBlocks;
 	}
 
-	public float getCompleted() {
-		return completed;
+	public float getCompletedBlocks() {
+		return completedBlocks;
 	}
 
 	public String getStatusStr() {