From f02f719cf28dea27923ad04dd7c1c50ea49933ff Mon Sep 17 00:00:00 2001
From: Dhandapani <dhandapani@gluster.com>
Date: Wed, 17 Aug 2011 16:09:00 +0530
Subject: conflict fixes

---
 .../gluster/storage/management/client/constants/ClientConstants.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/com.gluster.storage.management.client')

diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/constants/ClientConstants.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/constants/ClientConstants.java
index 765735fb..e253dfa5 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/constants/ClientConstants.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/constants/ClientConstants.java
@@ -27,7 +27,7 @@ public class ClientConstants {
 	public static final String SYS_PROP_SERVER_URL = "gluster.server.url";
 	public static final String DEFAULT_SERVER_URL = "https://localhost:8443/glustermg/linux.gtk.x86_64";
 	public static final String CONTEXT_ROOT = "glustermg";
-	public static final String REST_API_VERSION = "1.0";
+	public static final String REST_API_VERSION = "1.0.0";
 	
 	// SSL related
 	public static final String TRUSTED_KEYSTORE = "gmc-trusted.keystore"; 
-- 
cgit