diff options
| author | Dhandapani <dhandapani@gluster.com> | 2011-07-20 20:25:28 +0530 |
|---|---|---|
| committer | Dhandapani <dhandapani@gluster.com> | 2011-07-20 20:25:28 +0530 |
| commit | 8a7b9f6f156bd9197c6ddccdcb9fa62ed5beb7cd (patch) | |
| tree | 8f8eadaef56769b65c44759a1b115898c0ebeb5e /src/com.gluster.storage.management.gui/plugin.xml | |
| parent | c751399f60942f916753e429b97aa9ae600f40c9 (diff) | |
| parent | 01a08c0c3aeba21df5451de8243ced32a6b5b694 (diff) | |
Merge branch 'add-server'
Conflicts:
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ServerAdditionAction.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/ServerAdditionDialog.java
Diffstat (limited to 'src/com.gluster.storage.management.gui/plugin.xml')
0 files changed, 0 insertions, 0 deletions