diff options
| author | Selvasundaram <selvam@gluster.com> | 2011-08-02 17:27:14 +0530 |
|---|---|---|
| committer | Selvasundaram <selvam@gluster.com> | 2011-08-02 17:29:04 +0530 |
| commit | b36ba52ae16e75e8134a66f768f0993d62566a11 (patch) | |
| tree | ce4818b2a185405a6ea3e41085ca1439b1f872c3 /src/com.gluster.storage.management.gateway.scripts | |
| parent | 3da2d0ac73685886fa0eacea2cd2d629b23db9c1 (diff) | |
| parent | fb758c64d9df8a8536f00e9db744a4187be34d94 (diff) | |
Merge branch 'volumes'
Conflicts:
src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/GlusterUtil.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/BrickTableLabelProvider.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
Diffstat (limited to 'src/com.gluster.storage.management.gateway.scripts')
0 files changed, 0 insertions, 0 deletions