]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@inktank.com>
Fri, 14 Jun 2013 04:33:25 +0000 (21:33 -0700)
committerSage Weil <sage@inktank.com>
Fri, 14 Jun 2013 04:33:25 +0000 (21:33 -0700)
commit9b66f1aa8121d57510f7663dee1edf989cd15242
tree330a37121157f0ed095a8483484d4ada5f3b3104
parent71402a5daab97d6290294081f361ce20b1a133fa
parentc672b777f8093a652b96e5913d78eba5504f8ac7
Merge remote-tracking branch 'gh/next'
src/ceph.in
src/osdc/Objecter.cc
src/osdc/Objecter.h