diff --git a/_service b/_service index 87df822..4ee148e 100644 --- a/_service +++ b/_service @@ -6,7 +6,7 @@ ceph git no - disable + enable sh etc/ceph_ver_hack.sh diff --git a/_servicedata b/_servicedata index f6be537..516f4df 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/SUSE/ceph.git - 7527e4f0b85c4e0fa535633af966b9e7fae48416 \ No newline at end of file + 3f6446f64ff85e43ca1770a6d928d0981e9931ec \ No newline at end of file diff --git a/ceph-12.0.3+git.1495773033.07282a4057.tar.bz2 b/ceph-12.0.3+git.1495773033.07282a4057.tar.bz2 deleted file mode 100644 index 9e192ce..0000000 --- a/ceph-12.0.3+git.1495773033.07282a4057.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf6a0a5b987454b74a16f4c0f7f33ca7417fdc82ee79fbb3f0908c59942c0537 -size 119395784 diff --git a/ceph-12.0.3+git.1495787939.3f6446f64f.tar.bz2 b/ceph-12.0.3+git.1495787939.3f6446f64f.tar.bz2 new file mode 100644 index 0000000..b96e1be --- /dev/null +++ b/ceph-12.0.3+git.1495787939.3f6446f64f.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8e087657ea111a344d3acfd423df2764e2fb33a7e73281eedfad434a67e7162 +size 119395886 diff --git a/ceph-test.changes b/ceph-test.changes index a9ff265..0f1430f 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,7 +1,14 @@ +------------------------------------------------------------------- +Fri May 26 08:57:00 UTC 2017 - ncutler@suse.com + +- Update to version 12.0.3+git.1495787939.3f6446f64f: + + build/ops: rpm: adapt License line to Release 2.0 of SPDX spec + (issue#20091) + ------------------------------------------------------------------- Fri May 26 04:35:06 UTC 2017 - ncutler@suse.com -- Update to version 12.0.3+git.1495675338.4b3e261d08: +- Update to version 12.0.3+git.1495675338.07282a4057: + upstream 12.0.3 release + osd/PG: Add two new mClock implementations of the PG sharded operator queue (pr#14997, bsc#1040103) diff --git a/ceph-test.spec b/ceph-test.spec index 78f697b..c422d4c 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -70,10 +70,10 @@ # main package definition ################################################################################# Name: ceph-test -Version: 12.0.3+git.1495773033.07282a4057 +Version: 12.0.3+git.1495787939.3f6446f64f Release: 0%{?dist} Summary: Ceph benchmarks and test tools -License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT +License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0 WITH Autoconf-exception-2.0 and BSD-3-Clause and MIT %if 0%{?suse_version} Group: System/Filesystems %endif diff --git a/ceph.changes b/ceph.changes index a9ff265..0f1430f 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,7 +1,14 @@ +------------------------------------------------------------------- +Fri May 26 08:57:00 UTC 2017 - ncutler@suse.com + +- Update to version 12.0.3+git.1495787939.3f6446f64f: + + build/ops: rpm: adapt License line to Release 2.0 of SPDX spec + (issue#20091) + ------------------------------------------------------------------- Fri May 26 04:35:06 UTC 2017 - ncutler@suse.com -- Update to version 12.0.3+git.1495675338.4b3e261d08: +- Update to version 12.0.3+git.1495675338.07282a4057: + upstream 12.0.3 release + osd/PG: Add two new mClock implementations of the PG sharded operator queue (pr#14997, bsc#1040103) diff --git a/ceph.spec b/ceph.spec index cd63f5f..b563bef 100644 --- a/ceph.spec +++ b/ceph.spec @@ -70,10 +70,10 @@ # main package definition ################################################################################# Name: ceph -Version: 12.0.3+git.1495773033.07282a4057 +Version: 12.0.3+git.1495787939.3f6446f64f Release: 0%{?dist} Summary: User space components of the Ceph file system -License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT +License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0 WITH Autoconf-exception-2.0 and BSD-3-Clause and MIT %if 0%{?suse_version} Group: System/Filesystems %endif