]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-lock'
authorSage Weil <sage@inktank.com>
Tue, 26 Mar 2013 18:34:33 +0000 (11:34 -0700)
committerSage Weil <sage@inktank.com>
Tue, 26 Mar 2013 18:34:33 +0000 (11:34 -0700)
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

Trivial merge