]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@inktank.com>
Wed, 25 Sep 2013 04:46:47 +0000 (21:46 -0700)
committerSage Weil <sage@inktank.com>
Wed, 25 Sep 2013 04:46:47 +0000 (21:46 -0700)
commit952b39d4c4fcd1492234fcdba320895e4e520af5
treefe614cb2ad6109c2034c3771a2d8ec3a32b07488
parentc9e7e2f750cc6919959f2fd7351fa047b4c85a94
parent3de32562b55c6ece3a6ed783c36f8b9f21460339
Merge remote-tracking branch 'gh/next'

Conflicts:
src/osd/ReplicatedPG.cc
src/common/config_opts.h
src/mon/OSDMonitor.cc
src/osd/ReplicatedPG.cc
src/test/librados/misc.cc