Merge pull request #2035 from ceph/wip-da-SCA-20140623

Fix for SCA and CID issues

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

diff --cc src/libradosstriper/RadosStriperImpl.cc
Simple merge

diff --cc src/rgw/rgw_rados.h
Simple merge

diff --cc src/test/libradosstriper/striping.cc
Simple merge