diff options
| author | Selvasundaram <selvam@gluster.com> | 2011-07-27 21:50:26 +0530 |
|---|---|---|
| committer | Selvasundaram <selvam@gluster.com> | 2011-07-27 21:50:26 +0530 |
| commit | ad4971462e0681a969e3bb1da040200c9c88d451 (patch) | |
| tree | f0c2e8fc239674d1c1b2a80ab744e7a9fa2b3e2a /src/com.gluster.storage.management.gui/plugin.xml | |
| parent | 63c1c89a034feb4856ef2d96a4ac496756794580 (diff) | |
| parent | a05f9e63f8b68fd82a38499f3aa67dc5338376f1 (diff) | |
Merge branch 'master' of github.com:Selvasundaram/console
Conflicts:
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddServerAction.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/ClusterSummaryView.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/GlusterServersSummaryView.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/VolumesSummaryView.java
Diffstat (limited to 'src/com.gluster.storage.management.gui/plugin.xml')
0 files changed, 0 insertions, 0 deletions