]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@inktank.com>
Fri, 30 May 2014 17:13:59 +0000 (10:13 -0700)
committerSage Weil <sage@inktank.com>
Fri, 30 May 2014 17:13:59 +0000 (10:13 -0700)
commit3b884becca32fb5fb9091a80e4603c3de262bdee
treef9ac6bd2cbeb3fde973e06e7a7f8ef0b1a86371b
parent8691773ef04525bfca93f46a861919578cc1f4cd
parent9c56c86bdac6bcb8e76c3f04e7d393e4eaadd721
Merge remote-tracking branch 'gh/next'
src/osd/OSD.cc
src/osd/ReplicatedPG.cc
src/osd/osd_types.h
src/rgw/rgw_op.cc