diff options
| author | Dhandapani <dhandapani@gluster.com> | 2011-08-17 16:09:00 +0530 |
|---|---|---|
| committer | Dhandapani <dhandapani@gluster.com> | 2011-08-17 16:09:00 +0530 |
| commit | f02f719cf28dea27923ad04dd7c1c50ea49933ff (patch) | |
| tree | aef636b8b41b3814baeeaaf0485d11530b6fc1ac /src/com.gluster.storage.management.core | |
| parent | 54e55c446d871325de23269623968a196d881fbf (diff) | |
conflict fixes
Diffstat (limited to 'src/com.gluster.storage.management.core')
| -rw-r--r-- | src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java index 2ce1ea44..65bec003 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java @@ -353,6 +353,7 @@ public class Volume extends Entity { setReplicaCount(newVolume.getReplicaCount()); setStripeCount(newVolume.getStripeCount()); setNASProtocols(newVolume.getNASProtocols()); + setCifsUsers(newVolume.getCifsUsers()); getOptions().copyFrom(newVolume.getOptions()); } }
\ No newline at end of file |