diff options
| author | Shireesh Anjal <shireesh@gluster.com> | 2011-06-10 17:18:53 +0530 |
|---|---|---|
| committer | Shireesh Anjal <shireesh@gluster.com> | 2011-06-10 17:18:53 +0530 |
| commit | 26cdbc3ba32f8963b0ff533b2f19873c6ef11191 (patch) | |
| tree | 192a37e62b6a7f651d8fd6cb21ca3b832a8304b1 /src/com.gluster.storage.management.gui/plugin.xml | |
| parent | 19ae0ace5419f0cbf7a953311d45cc29bc1bcfc1 (diff) | |
| parent | ae1720c5ec14f5290d78eff56c63346234c1051a (diff) | |
Merge branch 'work'
Conflicts:
src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java
Diffstat (limited to 'src/com.gluster.storage.management.gui/plugin.xml')
0 files changed, 0 insertions, 0 deletions