]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'origin/wip-vstart-runner' into infernalis
authorGreg Farnum <gfarnum@redhat.com>
Wed, 7 Oct 2015 17:55:36 +0000 (10:55 -0700)
committerGreg Farnum <gfarnum@redhat.com>
Wed, 7 Oct 2015 17:55:36 +0000 (10:55 -0700)
Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Trivial merge