diff options
| author | Dhandapani <dhandapani@gluster.com> | 2011-08-17 16:09:00 +0530 |
|---|---|---|
| committer | Dhandapani <dhandapani@gluster.com> | 2011-08-17 16:09:00 +0530 |
| commit | f02f719cf28dea27923ad04dd7c1c50ea49933ff (patch) | |
| tree | aef636b8b41b3814baeeaaf0485d11530b6fc1ac /src/com.gluster.storage.management.gateway | |
| parent | 54e55c446d871325de23269623968a196d881fbf (diff) | |
conflict fixes
Diffstat (limited to 'src/com.gluster.storage.management.gateway')
2 files changed, 1 insertions, 2 deletions
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/web.xml b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/web.xml index 631788ff..54872639 100644 --- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/web.xml +++ b/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/web.xml @@ -37,7 +37,7 @@ </servlet> <servlet-mapping> <servlet-name>gluster-resources-1.0</servlet-name> - <url-pattern>/1.0/*</url-pattern> + <url-pattern>/1.0.0/*</url-pattern> </servlet-mapping> <servlet> <servlet-name>JnlpDownloadServlet</servlet-name> diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/constants/VolumeOptionsDefaults.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/constants/VolumeOptionsDefaults.java index 892ebf11..508a3029 100644 --- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/constants/VolumeOptionsDefaults.java +++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/constants/VolumeOptionsDefaults.java @@ -30,7 +30,6 @@ import com.gluster.storage.management.core.constants.CoreConstants; import com.gluster.storage.management.core.exceptions.ConnectionException; import com.gluster.storage.management.core.exceptions.GlusterRuntimeException; import com.gluster.storage.management.core.model.GlusterServer; -import com.gluster.storage.management.core.model.Status; import com.gluster.storage.management.core.model.VolumeOptionInfo; import com.gluster.storage.management.core.response.VolumeOptionInfoListResponse; import com.gluster.storage.management.gateway.services.ClusterService; |