diff options
| author | Selvasundaram <selvam@gluster.com> | 2011-07-04 19:20:26 +0530 |
|---|---|---|
| committer | Selvasundaram <selvam@gluster.com> | 2011-07-04 19:20:26 +0530 |
| commit | c2d7de50f8e54c85e53dc8803a8100d6711d1bb1 (patch) | |
| tree | a9a9bf318c02d6b1bc4152b7f63a3e54f91f456c /src/com.gluster.storage.management.server.scripts | |
| parent | f9ddc60ee998d24ff1f2b5f158a2b0e14f965b0d (diff) | |
| parent | 45ca89a241e826d80802d9e3e93d28f8cd026316 (diff) | |
Merge branch 'tasks'
Conflicts:
src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/AddBrickAction.java
src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/CommitTaskAction.java
src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/MigrateBrickTask.java
src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/GlusterUtil.java
Diffstat (limited to 'src/com.gluster.storage.management.server.scripts')
0 files changed, 0 insertions, 0 deletions