]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'origin/wip-6936' into firefly
authorJosh Durgin <josh.durgin@inktank.com>
Fri, 21 Feb 2014 21:10:47 +0000 (13:10 -0800)
committerJosh Durgin <josh.durgin@inktank.com>
Fri, 21 Feb 2014 21:10:47 +0000 (13:10 -0800)
commit68f6266089290f894ce257cb228838e51dcdec37
tree4bb5dad04c8c8daec5892e4f775e78855b0631ef
parent8ebc2a266f410e8376099ed81ff2bdf5ceca0577
parent53de64122b206d11aa42fd401f88f02f2908e942
Merge remote-tracking branch 'origin/wip-6936' into firefly

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>