]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #1432 from ceph/wip-7687
authorSage Weil <sage@inktank.com>
Wed, 12 Mar 2014 01:23:14 +0000 (18:23 -0700)
committerSage Weil <sage@inktank.com>
Wed, 12 Mar 2014 01:23:14 +0000 (18:23 -0700)
commita890ef0928245ac2b84b814f6b4b9b88cae4dc41
treef40810693077aa07a2ed8265bdf0a42856e84e70
parentd72c2bbccb7a50c942bbb98f10599a266d8f9ea3
parentd5737107a107c3160b7be39b123bdd2e412fe08f
Merge pull request #1432 from ceph/wip-7687

rgw: don't overwrite bucket entry data when syncing user stats

Reviewed-by: Sage Weil <sage@inktank.com>