diff --git a/_service b/_service index 3d2e3eb..9c76ee8 100644 --- a/_service +++ b/_service @@ -1,12 +1,12 @@ - 12.1.4+git.%ct.%h + 12.2.0+git.%ct.%h git://github.com/SUSE/ceph.git ses5 ceph git no - enable + disable sh etc/ceph_ver_hack.sh diff --git a/ceph-12.1.4+git.1502953626.155adb5253.tar.bz2 b/ceph-12.1.4+git.1502953626.155adb5253.tar.bz2 deleted file mode 100644 index 4f69096..0000000 --- a/ceph-12.1.4+git.1502953626.155adb5253.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:677196aaad17ec4d5354065389379c81c4b676961a4e64c839fb6fa4c9231ffa -size 127205819 diff --git a/ceph-12.2.0+git.1504013812.01ea30bcc9.tar.bz2 b/ceph-12.2.0+git.1504013812.01ea30bcc9.tar.bz2 new file mode 100644 index 0000000..627e4fb --- /dev/null +++ b/ceph-12.2.0+git.1504013812.01ea30bcc9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9405f2725a9694545c4e737c1ce2a7b2a2a8d2296310c18d789f77e0efdbed24 +size 127202900 diff --git a/ceph-test.changes b/ceph-test.changes index bd2d6da..a0e5317 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Aug 29 14:16:26 UTC 2017 - ncutler@suse.com + +- Update to version 12.2.0+git.1504013812.01ea30bcc9: + + upstream Luminous v12.2.0 (first stable) release + * increment version number to 12.2.0 + + spec file + * edge mem_per_process upward after seeing some OOM-esque build failures + * package ceph-volume man pages + ------------------------------------------------------------------- Thu Aug 17 07:21:22 UTC 2017 - ncutler@suse.com diff --git a/ceph-test.spec b/ceph-test.spec index 2219a57..ba33594 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -68,7 +68,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 12.1.4+git.1502953626.155adb5253 +Version: 12.2.0+git.1504013812.01ea30bcc9 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -460,7 +460,7 @@ echo "System limits:" ulimit -a lo_jobs_reduced= if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then - mem_per_process=1600 + mem_per_process=1700 max_mem=$(LANG=C free -t -m | sed -n "s|^Mem: *\([0-9]*\).*$|\1|p") max_jobs="$(($max_mem / $mem_per_process))" test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing build parallelism to -j$max_jobs because of memory limits" @@ -577,6 +577,8 @@ rm -rf %{buildroot}%{_mandir}/man8/ceph-deploy.8* rm -rf %{buildroot}%{_mandir}/man8/ceph-detect-init.8* rm -rf %{buildroot}%{_mandir}/man8/ceph-create-keys.8* rm -rf %{buildroot}%{_mandir}/man8/ceph-disk.8* +rm -rf %{buildroot}%{_mandir}/man8/ceph-volume.8* +rm -rf %{buildroot}%{_mandir}/man8/ceph-volume-systemd.8* rm -rf %{buildroot}%{_mandir}/man8/ceph-run.8* rm -rf %{buildroot}%{_mandir}/man8/crushtool.8* rm -rf %{buildroot}%{_mandir}/man8/osdmaptool.8* diff --git a/ceph.changes b/ceph.changes index bd2d6da..a0e5317 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Aug 29 14:16:26 UTC 2017 - ncutler@suse.com + +- Update to version 12.2.0+git.1504013812.01ea30bcc9: + + upstream Luminous v12.2.0 (first stable) release + * increment version number to 12.2.0 + + spec file + * edge mem_per_process upward after seeing some OOM-esque build failures + * package ceph-volume man pages + ------------------------------------------------------------------- Thu Aug 17 07:21:22 UTC 2017 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index 598e892..939907d 100644 --- a/ceph.spec +++ b/ceph.spec @@ -68,7 +68,7 @@ # main package definition ################################################################################# Name: ceph -Version: 12.1.4+git.1502953626.155adb5253 +Version: 12.2.0+git.1504013812.01ea30bcc9 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -887,7 +887,7 @@ echo "System limits:" ulimit -a lo_jobs_reduced= if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then - mem_per_process=1600 + mem_per_process=1700 max_mem=$(LANG=C free -t -m | sed -n "s|^Mem: *\([0-9]*\).*$|\1|p") max_jobs="$(($max_mem / $mem_per_process))" test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing build parallelism to -j$max_jobs because of memory limits" @@ -1028,6 +1028,8 @@ rm -rf %{buildroot} %{_mandir}/man8/ceph-detect-init.8* %{_mandir}/man8/ceph-create-keys.8* %{_mandir}/man8/ceph-disk.8* +%{_mandir}/man8/ceph-volume.8* +%{_mandir}/man8/ceph-volume-systemd.8* %{_mandir}/man8/ceph-run.8* %{_mandir}/man8/crushtool.8* %{_mandir}/man8/osdmaptool.8*