]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge branch 'jewel'
authorGreg Farnum <gfarnum@redhat.com>
Tue, 12 Apr 2016 14:32:48 +0000 (07:32 -0700)
committerGreg Farnum <gfarnum@redhat.com>
Tue, 12 Apr 2016 14:32:48 +0000 (07:32 -0700)

Trivial merge