]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'stable' into next
authorSage Weil <sage@inktank.com>
Wed, 11 Jul 2012 01:21:29 +0000 (18:21 -0700)
committerSage Weil <sage@inktank.com>
Wed, 11 Jul 2012 01:21:29 +0000 (18:21 -0700)

Trivial merge