summaryrefslogtreecommitdiffstats
path: root/src/com.gluster.storage.management.gui.feature.webstart/feature.xml
diff options
context:
space:
mode:
authorDhandapani <dhandapani@gluster.com>2011-06-23 12:08:33 +0530
committerDhandapani <dhandapani@gluster.com>2011-06-23 12:23:42 +0530
commitd05b6d480d09389e57df7490a44eacdfe6fe8c68 (patch)
tree9f06b455eced236e7208b942ef2012bf6c1600f2 /src/com.gluster.storage.management.gui.feature.webstart/feature.xml
parentdc9006106dd12324119d04796b5b054555ab82a8 (diff)
parent31fb6f106e6626ffd922139186cff1ed0e2adc95 (diff)
Merge branch 'initialize-disk'
Conflicts: src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/InitializeDiskTask.java
Diffstat (limited to 'src/com.gluster.storage.management.gui.feature.webstart/feature.xml')
0 files changed, 0 insertions, 0 deletions