]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge branch 'master' into jewel
authorGreg Farnum <gfarnum@redhat.com>
Fri, 11 Mar 2016 17:21:24 +0000 (09:21 -0800)
committerGreg Farnum <gfarnum@redhat.com>
Fri, 11 Mar 2016 17:21:24 +0000 (09:21 -0800)

Trivial merge