diff options
| author | Selvam <selvam@gluster.com> | 2011-04-05 15:35:52 +0530 |
|---|---|---|
| committer | Selvam <selvam@gluster.com> | 2011-04-05 16:00:47 +0530 |
| commit | 1fc1b836cab2003dff92a201d78a322d8f95ad3c (patch) | |
| tree | d2543f678a210a7fa223d86a884e08a81c7ee33c /src/com.gluster.storage.management.server.scripts | |
| parent | 3e997efcd1f569d38b1ac7623c4e10dd35da416a (diff) | |
| parent | 5b0bc49b37634aa8923c33b96dd3e4630447874c (diff) | |
Merge remote branch 'upstream/master'
Conflicts:
src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java
src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/RunningTaskResource.java
src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/VolumesResource.java
Diffstat (limited to 'src/com.gluster.storage.management.server.scripts')
0 files changed, 0 insertions, 0 deletions