]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-config'
authorSage Weil <sage@inktank.com>
Tue, 3 Jul 2012 20:04:36 +0000 (13:04 -0700)
committerSage Weil <sage@inktank.com>
Tue, 3 Jul 2012 20:04:36 +0000 (13:04 -0700)

Trivial merge