diff options
| author | Selvasundaram <selvam@gluster.com> | 2011-07-04 19:06:51 +0530 |
|---|---|---|
| committer | Selvasundaram <selvam@gluster.com> | 2011-07-04 19:06:51 +0530 |
| commit | f9ddc60ee998d24ff1f2b5f158a2b0e14f965b0d (patch) | |
| tree | 6efef62ed2b7fd7791cb6016cfbf2ddfaa58479f /src/com.gluster.storage.management.gui/plugin.xml | |
| parent | 552e7c7f05bfd553c9d539926f4aca0f08c5c246 (diff) | |
| parent | 2710aaba814aeac87cc7d83a45c066ab7b7a164e (diff) | |
Merge branch 'master' of github.com:gluster/console
Conflicts:
src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/Task.java
Diffstat (limited to 'src/com.gluster.storage.management.gui/plugin.xml')
0 files changed, 0 insertions, 0 deletions