]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'mix_stale' into unstable
authorSage Weil <sage@newdream.net>
Wed, 3 Nov 2010 23:40:19 +0000 (16:40 -0700)
committerSage Weil <sage@newdream.net>
Wed, 3 Nov 2010 23:40:19 +0000 (16:40 -0700)

Trivial merge