]> 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>
Fri, 8 Nov 2013 18:23:23 +0000 (10:23 -0800)
committerJohn Wilkins <john.wilkins@inktank.com>
Fri, 8 Nov 2013 18:23:23 +0000 (10:23 -0800)

Trivial merge