]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'origin/jewel'
authorJosh Durgin <jdurgin@redhat.com>
Tue, 29 Mar 2016 18:32:39 +0000 (11:32 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Tue, 29 Mar 2016 18:33:02 +0000 (11:33 -0700)

Trivial merge