]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/firefly' into firefly-next
authorSage Weil <sage@redhat.com>
Tue, 14 Oct 2014 21:57:42 +0000 (14:57 -0700)
committerSage Weil <sage@redhat.com>
Tue, 14 Oct 2014 21:57:42 +0000 (14:57 -0700)

Trivial merge