]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'master' of https://github.com/ceph/ceph
authorJohn Wilkins <john.wilkins@inktank.com>
Tue, 18 Sep 2012 21:17:19 +0000 (14:17 -0700)
committerJohn Wilkins <john.wilkins@inktank.com>
Tue, 18 Sep 2012 21:17:19 +0000 (14:17 -0700)

Trivial merge