]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #9430 from ceph/wip-manila-backports
authorJohn Spray <jspray@redhat.com>
Fri, 3 Jun 2016 11:37:00 +0000 (12:37 +0100)
committerJohn Spray <jspray@redhat.com>
Fri, 3 Jun 2016 11:37:00 +0000 (12:37 +0100)
jewel: backports needed for Manila

Reviewed-by: John Spray <john.spray@redhat.com>

Trivial merge