]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
rebased with master
authorJames Saint-Rossy <james_saintrossy@cable.comcast.com>
Mon, 8 Aug 2016 21:31:18 +0000 (17:31 -0400)
committerJames Saint-Rossy <james_saintrossy@cable.comcast.com>
Mon, 8 Aug 2016 21:31:18 +0000 (17:31 -0400)

Trivial merge