]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #22446 into master
authorSage Weil <sage@redhat.com>
Wed, 12 Jun 2019 14:11:49 +0000 (09:11 -0500)
committerSage Weil <sage@redhat.com>
Wed, 12 Jun 2019 14:11:49 +0000 (09:11 -0500)
* refs/pull/22446/head:
relicense LGPL-2.1 code as LGPL-2.1 or LGPL-3.0
COPYING: add reference to a few Apache-2.0 licensed source files
debian/copyright: sync with COPYING
COPYING: LGPL2.1 -> LGPL-2.1
COPYING: extra bits from debian/copyright

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
1  2 
alpine/APKBUILD.in
ceph.spec.in

Simple merge
diff --cc ceph.spec.in
Simple merge