diff options
| author | Dhandapani <dhandapani@gluster.com> | 2011-09-29 14:51:30 +0530 |
|---|---|---|
| committer | Dhandapani <dhandapani@gluster.com> | 2011-09-29 14:51:30 +0530 |
| commit | 68fd8e965a10831272bfd3ee050a070ea4caa88c (patch) | |
| tree | 810c7499c5f2934f9eabaceb50f7d964240206d2 /src/com.gluster.storage.management.console/plugin.xml | |
| parent | 84bbc4cc3f85134d4f657424d3cf58298abe0c88 (diff) | |
| parent | 41443888c6cfbc9d5debb675df9f484d1a9131bb (diff) | |
Merge branch 'master' of git@github.com:Dhandapani/console
Conflicts:
src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java
src/com.gluster.storage.management.console/plugin.xml
src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/VolumeLogRotateAction.java
src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java
Diffstat (limited to 'src/com.gluster.storage.management.console/plugin.xml')
0 files changed, 0 insertions, 0 deletions