]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'next'
authorGary Lowell <gary.lowell@inktank.com>
Tue, 10 Dec 2013 21:00:14 +0000 (21:00 +0000)
committerGary Lowell <gary.lowell@inktank.com>
Tue, 10 Dec 2013 21:00:14 +0000 (21:00 +0000)
commite5a02c33e23e4fbdc7bf0f16a5bbff61f4e37186
tree1c48b33d89f2c2e39202e077c2ef4022c2ac695d
parentb66902b64ecc548fabf9d6d1d98935935edcc134
parentd8ad51ee8ab508bc523a0398f54d8d9c5785b8d8
Merge branch 'next'
configure.ac
src/common/config_opts.h
src/mon/OSDMonitor.cc
src/os/FileStore.cc
src/os/FileStore.h
src/os/ObjectStore.h
src/osd/OSD.cc
src/osd/OSD.h
src/osd/OSDMap.cc
src/osd/OSDMap.h