]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-lpg'
authorSage Weil <sage.weil@dreamhost.com>
Fri, 27 Apr 2012 04:57:23 +0000 (21:57 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Fri, 27 Apr 2012 04:57:23 +0000 (21:57 -0700)
commit05b4fb33a1c8727089cf4283a612b94b95981cd1
tree2129442d2413ad84bad756f84f8c291d3b26ac66
parentcee218f0da204b10d5798bfe79802d6acad70cca
parent19ba34753e8853b3dc4e592c56dde387590e8f31
Merge branch 'wip-lpg'

Conflicts:
src/osd/OSDMap.h
src/client/Client.cc
src/common/config.cc
src/common/config_opts.h
src/mon/OSDMonitor.cc
src/mon/PGMonitor.cc
src/osd/OSDMap.h