]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'upstream/wip_pg_temp' into next
authorSamuel Just <sam.just@inktank.com>
Thu, 20 Dec 2012 00:50:11 +0000 (16:50 -0800)
committerSamuel Just <sam.just@inktank.com>
Thu, 20 Dec 2012 00:51:25 +0000 (16:51 -0800)
Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Joao Luis <joao.luis@inktank.com>

Trivial merge