]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-12983' of git://github.com/dzafman/ceph into infernalis
authorSage Weil <sage@redhat.com>
Wed, 30 Sep 2015 01:09:43 +0000 (21:09 -0400)
committerSage Weil <sage@redhat.com>
Wed, 30 Sep 2015 01:09:43 +0000 (21:09 -0400)

Trivial merge