diff options
| author | Dhandapani <dhandapani@gluster.com> | 2011-07-25 22:07:01 +0530 |
|---|---|---|
| committer | Dhandapani <dhandapani@gluster.com> | 2011-07-25 22:07:01 +0530 |
| commit | f738a9873ac0d7eeb7ecad92b499c6718e18a32e (patch) | |
| tree | 22098db977615eb486f1bb8732e4e93b36a5f4f7 /src/com.gluster.storage.management.server | |
| parent | 2c0409e7809aec2398526cfccbea88528952694d (diff) | |
| parent | cdd96ee20614141213f9932b886d7e19bbe4dcd1 (diff) | |
Merge branch 'master' of git@github.com:Dhandapani/console
Conflicts:
src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterDataModelManager.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumePage1.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java
src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java
Diffstat (limited to 'src/com.gluster.storage.management.server')
| -rw-r--r-- | src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java index b7112c08..642198df 100644 --- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java +++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java @@ -42,6 +42,7 @@ import com.gluster.storage.management.core.model.Server.SERVER_STATUS; import com.gluster.storage.management.core.model.Status; import com.gluster.storage.management.core.model.TaskStatus; import com.gluster.storage.management.core.model.Volume; +import com.gluster.storage.management.core.model.Volume.NAS_PROTOCOL; import com.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE; import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS; import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE; |