diff options
| author | Selvam <selvam@gluster.com> | 2011-04-29 15:04:18 +0530 |
|---|---|---|
| committer | Selvam <selvam@gluster.com> | 2011-04-29 15:04:18 +0530 |
| commit | 3149b18d24539f5680848c25064f447c15bbbcc4 (patch) | |
| tree | 4f6b3ef9fcb7a8951511324697752528191fc49e /src/com.gluster.storage.management.gui/plugin.xml | |
| parent | e4b86192d443e968cf2ad417a46c203ab2751418 (diff) | |
| parent | 276118b6d207bb49905d1e9c19a7f08c33f9ed8d (diff) | |
Merge remote branch 'upstream/master'
Conflicts:
src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java
src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java
src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java
Diffstat (limited to 'src/com.gluster.storage.management.gui/plugin.xml')
0 files changed, 0 insertions, 0 deletions