diff options
| author | Selvasundaram <selvam@gluster.com> | 2011-07-27 22:30:41 +0530 |
|---|---|---|
| committer | Selvasundaram <selvam@gluster.com> | 2011-07-27 22:30:41 +0530 |
| commit | a0488e4bc20abad5ddc0d14b6f4501fc67784df8 (patch) | |
| tree | 4d9c7e07d9da93a71de9e8309af5bfa3d7e358bb /src/com.gluster.storage.management.server.scripts | |
| parent | 6421ba49db5ce77615b3190a714ac2d53fa21b43 (diff) | |
| parent | 740ced012011fd86837a1eaa59cb41d5a984edf2 (diff) | |
Merge branch 'bugs'
Conflicts:
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.server.scripts')
0 files changed, 0 insertions, 0 deletions