import ceph octopus 15.2.3 source

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/ceph/CMakeLists.txt b/ceph/CMakeLists.txt
index caf4ac4dd72ccdd6028a51d3e62179fa02087e8d..e226b8dff4e43d0ef3d5a7e1940205ef5b3cb38a 100644 (file)
--- a/ceph/CMakeLists.txt
+++ b/ceph/CMakeLists.txt
@@ -667,4 +667,4 @@ add_custom_target(tags DEPENDS ctags)
 
 find_package(CppCheck)
 find_package(IWYU)
-set(VERSION 15.2.2)
+set(VERSION 15.2.3)

diff --git a/ceph/alpine/APKBUILD b/ceph/alpine/APKBUILD
index 78b1ffd01278a482ffdf5240ba5117ff32ac69b2..37e9144be1ccd646d5e1c0f0a8b0c6d6f1ed7b77 100644 (file)
--- a/ceph/alpine/APKBUILD
+++ b/ceph/alpine/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: John Coyle <dx9err@gmail.com>
 # Maintainer: John Coyle <dx9err@gmail.com>
 pkgname=ceph
-pkgver=15.2.2
+pkgver=15.2.3
 pkgrel=0
 pkgdesc="Ceph is a distributed object store and file system"
 pkgusers="ceph"
@@ -63,7 +63,7 @@ makedepends="
        xmlstarlet
        yasm
 "
-source="ceph-15.2.2.tar.bz2"
+source="ceph-15.2.3.tar.bz2"
 subpackages="
        $pkgname-base
        $pkgname-common
@@ -116,7 +116,7 @@ _sysconfdir=/etc
 _udevrulesdir=/etc/udev/rules.d
 _python_sitelib=/usr/lib/python2.7/site-packages
 
-builddir=$srcdir/ceph-15.2.2
+builddir=$srcdir/ceph-15.2.3
 
 build() {
        export CEPH_BUILD_VIRTUALENV=$builddir

diff --git a/ceph/ceph.spec b/ceph/ceph.spec
index 7946fad10d03ffbb454d99e23f5454e0a72ed143..6bd376c799caa1856621d49de975f7b01540acc6 100644 (file)
--- a/ceph/ceph.spec
+++ b/ceph/ceph.spec
@@ -98,7 +98,7 @@
 # main package definition
 #################################################################################
 Name:          ceph
-Version:       15.2.2
+Version:       15.2.3
 Release:       0%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:         2
@@ -114,7 +114,7 @@ License:    LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-
 Group:         System/Filesystems
 %endif
 URL:           http://ceph.com/
-Source0:       %{?_remote_tarball_prefix}ceph-15.2.2.tar.bz2
+Source0:       %{?_remote_tarball_prefix}ceph-15.2.3.tar.bz2
 %if 0%{?suse_version}
 # _insert_obs_source_lines_here
 ExclusiveArch:  x86_64 aarch64 ppc64le s390x
@@ -1117,7 +1117,7 @@ This package provides Ceph’s default alerts for Prometheus.
 # common
 #################################################################################
 %prep
-%autosetup -p1 -n ceph-15.2.2
+%autosetup -p1 -n ceph-15.2.3
 
 %build
 # LTO can be enabled as soon as the following GCC bug is fixed:

diff --git a/ceph/changelog.upstream b/ceph/changelog.upstream
index b11435736619075c35bd0b78e99985f2357d2d30..7f81d0a40c816f9539151431047822811ccc7f6e 100644 (file)
--- a/ceph/changelog.upstream
+++ b/ceph/changelog.upstream
@@ -1,7 +1,13 @@
-ceph (15.2.2-1bionic) bionic; urgency=medium
+ceph (15.2.3-1bionic) bionic; urgency=medium
 
 
- -- Jenkins Build Slave User <jenkins-build@braggi13.front.sepia.ceph.com>  Mon, 18 May 2020 16:37:36 +0000
+ -- Jenkins Build Slave User <jenkins-build@braggi13.front.sepia.ceph.com>  Fri, 29 May 2020 16:37:54 +0000
+
+ceph (15.2.3-1) stable; urgency=medium
+
+  * New upstream release
+
+ -- Ceph Release Team <ceph-maintainers@ceph.com>  Fri, 29 May 2020 16:24:48 +0000
 
 ceph (15.2.2-1) stable; urgency=medium
 

diff --git a/ceph/src/.git_version b/ceph/src/.git_version
index d84310f9b0694f94bf4ab68777f757a5b9c5ffb5..d9b1b48b8929a5ce15818f927dec626bb88a0e8e 100644 (file)
--- a/ceph/src/.git_version
+++ b/ceph/src/.git_version
@@ -1,2 +1,2 @@
-0c857e985a29d90501a285f242ea9c008df49eb8
-15.2.2
+d289bbdec69ed7c1f516e0a093594580a76b78d0
+15.2.3

diff --git a/ceph/src/common/options.cc b/ceph/src/common/options.cc
index bb3b3ef393bdbd17046a92c5b92cd172b77ff333..f44c03f6c3b2db8d5f38506364e03dfc519540af 100644 (file)
--- a/ceph/src/common/options.cc
+++ b/ceph/src/common/options.cc
@@ -4008,7 +4008,7 @@ std::vector<Option> get_global_options() {
     .set_description(""),
 
     Option("bluefs_preextend_wal_files", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
-    .set_default(true)
+    .set_default(false)
     .set_description("Preextent rocksdb wal files on mkfs to avoid performance penalty"),
 
     Option("bluefs_log_replay_check_allocations", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)