diff options
| author | Dhandapani <dhandapani@gluster.com> | 2011-07-19 18:10:26 +0530 |
|---|---|---|
| committer | Dhandapani <dhandapani@gluster.com> | 2011-07-19 18:10:26 +0530 |
| commit | c6ac200224c810071d2737414cdefdaa1c4a4a40 (patch) | |
| tree | 4446419ee7d517106c19286272f6585ee920dff2 /src/com.gluster.storage.management.server.scripts | |
| parent | 667f996529700db44d605153e303a0220a805e03 (diff) | |
| parent | 829887511fe2f63b22a9e7b92bee80ba8987cffc (diff) | |
Merge branch 'initialize-disk'
Conflicts:
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/pages/AbstractDisksPage.java
src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/v1_0/GlusterServersResource.java
Diffstat (limited to 'src/com.gluster.storage.management.server.scripts')
0 files changed, 0 insertions, 0 deletions