]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #26632 into master 26632/head
authorSage Weil <sage@redhat.com>
Mon, 25 Feb 2019 16:44:43 +0000 (10:44 -0600)
committerSage Weil <sage@redhat.com>
Mon, 25 Feb 2019 16:44:43 +0000 (10:44 -0600)
* refs/pull/26632/head:
14.1.0

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>

Trivial merge