]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'origin/next'
authorJosh Durgin <jdurgin@redhat.com>
Thu, 30 Jul 2015 23:35:01 +0000 (16:35 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Thu, 30 Jul 2015 23:35:01 +0000 (16:35 -0700)
commit03491ae843527ac9c15088c745f7b6ae2e8d42b3
tree6070a6e19fdd68ded4fb8d72621b10aec9ffb815
parentca40bf0b30a79cb5dcc713c0b966065213347854
parent27fa210f40125df5f6fbf6a1ba1dd49a834be3f8
Merge remote-tracking branch 'origin/next'
src/rbd.cc
src/rgw/rgw_main.cc
src/test/librbd/fsx.cc