]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #504 from ceph/wip-firefly2
authorJosh Durgin <jdurgin@redhat.com>
Wed, 22 Jul 2015 21:29:31 +0000 (14:29 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Wed, 22 Jul 2015 21:29:31 +0000 (14:29 -0700)
Partly reverted ref to firefly-orginal

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Trivial merge