]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/giant'
authorSage Weil <sage@redhat.com>
Thu, 23 Oct 2014 23:44:45 +0000 (16:44 -0700)
committerSage Weil <sage@redhat.com>
Thu, 23 Oct 2014 23:44:45 +0000 (16:44 -0700)
commitbf4d72a9603f1adffb8c3204bea21b0efe2190db
treef2347a9914ac103be3c202fa9fbcc6ed82b27e10
parent9a12467a9c04842f4866bb665e3efddb0b38e2b4
parent8a9b953b7ca29574f3c6db2dc06732c7d06a9109
Merge remote-tracking branch 'gh/giant'
src/common/buffer.cc
src/mon/Monitor.cc
src/osdc/Objecter.cc
src/test/bufferlist.cc
src/test/erasure-code/ceph_erasure_code_benchmark.cc