summaryrefslogtreecommitdiffstats
path: root/src/com.gluster.storage.management.gui/plugin.xml
diff options
context:
space:
mode:
authorDhandapani <dhandapani@gluster.com>2011-07-05 19:05:42 +0530
committerDhandapani <dhandapani@gluster.com>2011-07-05 19:05:42 +0530
commitd4af6dafe81c47570f1c377b4b01182ab041e9f9 (patch)
tree6151968f2295e66b26dd585b4bb6b495819a13c5 /src/com.gluster.storage.management.gui/plugin.xml
parentd2921588f7acf4f3f5bad3974cb45118057b0372 (diff)
parent38d37de20e9a50addf000132f8208c7e87219b91 (diff)
Merge branch 'initialize-disk'
Conflicts: src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/InitDiskStatusResponse.java src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractDisksPage.java
Diffstat (limited to 'src/com.gluster.storage.management.gui/plugin.xml')
0 files changed, 0 insertions, 0 deletions