summaryrefslogtreecommitdiffstats
path: root/src/com.gluster.storage.management.server.scripts
diff options
context:
space:
mode:
authorSelvam <selvam@gluster.com>2011-04-25 17:33:12 +0530
committerSelvam <selvam@gluster.com>2011-04-25 17:33:12 +0530
commitc11192c4cf06f14ad90d72819ebeee2ad527f16d (patch)
tree68b7489f844400f3784c0e00c183252d9ede4715 /src/com.gluster.storage.management.server.scripts
parent1d427384a6c8f28e2312042c350032cd22313bcc (diff)
parent99014bdfd97d4fc25fc0866c47019769721d7093 (diff)
Merge branch 'volume-property'
Conflicts: src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumeSummaryView.java src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeOptionsPage.java
Diffstat (limited to 'src/com.gluster.storage.management.server.scripts')
0 files changed, 0 insertions, 0 deletions