]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #495 from ceph/wip-firefly
authorYuri Weinstein <yuri.weinstein@gmail.com>
Wed, 15 Jul 2015 21:22:35 +0000 (14:22 -0700)
committerYuri Weinstein <yuri.weinstein@gmail.com>
Wed, 15 Jul 2015 21:22:35 +0000 (14:22 -0700)
Changed 'firefly-original' ref to 'firefly'


Trivial merge