]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: cd90061) | patch
rgw: Fix some merge problems uncovered by gcc warnings:
authorJosh Pieper <jjp@pobox.com>
Fri, 11 Nov 2011 13:19:55 +0000 (08:19 -0500)
committerSage Weil <sage@newdream.net>
Mon, 14 Nov 2011 21:23:29 +0000 (13:23 -0800)
commit2445fd8416b4ce55376dd0f7f3f5f3227529d239
tree71efde19acc2fedfe9121c9a6e2d75d7aa9c8c1btree | snapshot
parentcd90061239a598f6fca94326b6d2c32f325c96ebcommit | diff
rgw: Fix some merge problems uncovered by gcc warnings:

 * a refactor in e2100bce left the mod_ptr and unmod_ptr members set
   incorrectly in RGWCopyObj::init_common
 * a fix in 6752babd aggregated error returns, but then failed to do
   anything with them

Signed-off-by: Josh Pieper <jjp@pobox.com>
Signed-off-by: Sage Weil <sage@newdream.net>
src/rgw/rgw_op.cc diff | blob | history
src/rgw/rgw_op.h diff | blob | history
src/rgw/rgw_rados.cc diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.