[Pkg-ceph-commits] [ceph] 01/02: Merge branch 'master' into jessie-backports
Gaudenz Steinlin
gaudenz at moszumanska.debian.org
Tue Oct 20 14:22:32 UTC 2015
This is an automated email from the git hooks/post-receive script.
gaudenz pushed a commit to branch jessie-backports
in repository ceph.
commit 5f1d2cc2c7a55276e577b623a1cac2b2fd95bc61
Merge: baa1ef8 f4e7a5d
Author: Gaudenz Steinlin <gaudenz at debian.org>
Date: Tue Oct 13 10:36:39 2015 +0200
Merge branch 'master' into jessie-backports
Git-Dch: ignore
Makefile.in | 319 +-
aclocal.m4 | 742 +++--
ar-lib | 15 +-
autogen.sh | 9 +
ceph.spec | 8 +-
ceph.spec.in | 6 +-
compile | 99 +-
config.guess | 184 +-
config.sub | 106 +-
configure | 999 ++++---
configure.ac | 2 +-
debian/ceph-common.bash-completion | 2 +
debian/ceph-common.install | 2 -
debian/ceph-common.maintscript | 2 +
debian/ceph-test.install | 3 +-
debian/ceph.bash-completion | 1 +
debian/ceph.install | 1 -
debian/ceph.maintscript | 1 +
debian/changelog | 25 +
debian/control | 6 +-
debian/gbp.conf | 3 +-
debian/patches/CVE-2015-5245.patch | 31 +
debian/patches/backfill-prio.patch | 68 +-
debian/patches/boost-1.57_1.patch | 118 +
debian/patches/boost-1.57_2.patch | 38 +
debian/patches/boost-1.58.patch | 28 +
debian/patches/bug-11860.patch | 24 +
.../patches/fix-build-without-libatomic-ops.patch | 32 +
debian/patches/series | 6 +
debian/radosgw.bash-completion | 1 +
debian/radosgw.install | 1 -
debian/radosgw.maintscript | 1 +
debian/rules | 6 +-
depcomp | 487 +--
install-sh | 14 +-
ltmain.sh | 4 +-
m4/libtool.m4 | 52 +-
man/Makefile.am | 1 +
man/Makefile.in | 130 +-
man/ceph-disk.8 | 272 ++
man/ceph.8 | 233 +-
missing | 414 +--
py-compile | 23 +-
src/.git_version | 4 +-
src/Makefile.in | 3058 +++++++++----------
src/acconfig.h.in | 3 -
src/cls/rgw/cls_rgw.cc | 3 +-
src/cls/rgw/cls_rgw_types.h | 2 +-
src/common/RWLock.h | 24 +-
src/common/WorkQueue.cc | 9 +-
src/common/code_environment.h | 1 +
src/common/common_init.cc | 1 +
src/common/config_opts.h | 5 +
src/common/histogram.h | 4 +
src/common/hobject.cc | 14 +
src/crush/CrushWrapper.cc | 6 +-
src/gtest/Makefile.in | 932 ++++--
src/gtest/aclocal.m4 | 723 +++--
compile => src/gtest/build-aux/compile | 99 +-
src/gtest/build-aux/config.guess | 184 +-
src/gtest/build-aux/config.sub | 106 +-
src/gtest/build-aux/depcomp | 487 +--
src/gtest/build-aux/install-sh | 14 +-
src/gtest/build-aux/ltmain.sh | 4 +-
src/gtest/build-aux/missing | 414 +--
src/gtest/build-aux/test-driver | 139 +
src/gtest/configure | 638 ++--
src/gtest/m4/libtool.m4 | 52 +-
src/init-radosgw | 8 +-
src/init-radosgw.sysv | 8 +-
src/java/Makefile.in | 101 +-
src/librados/RadosClient.cc | 19 +-
src/librados/librados.cc | 9 +-
src/librbd/ImageCtx.cc | 2 -
src/librbd/internal.cc | 26 +-
src/mds/MDS.cc | 27 +-
src/messages/MWatchNotify.h | 34 +-
src/mon/MonCap.cc | 6 +-
src/mon/MonCap.h | 8 +-
src/mon/Monitor.cc | 7 +-
src/mon/OSDMonitor.cc | 20 +-
src/mon/PGMonitor.cc | 20 +-
src/mon/Session.h | 3 +-
src/mount/mtab.c | 14 +-
src/msg/Pipe.cc | 2 +-
src/ocf/Makefile.in | 103 +-
src/os/DBObjectMap.cc | 12 +-
src/os/FileJournal.cc | 33 +-
src/os/FileStore.cc | 41 +-
src/os/FileStore.h | 5 +-
src/os/JournalingObjectStore.cc | 5 +
src/os/JournalingObjectStore.h | 1 +
src/os/ObjectStore.cc | 5 +-
src/os/ObjectStore.h | 11 +-
src/osd/OSD.cc | 111 +-
src/osd/OSD.h | 8 +-
src/osd/OSDMap.cc | 10 +-
src/osd/PG.cc | 55 +-
src/osd/PG.h | 2 +-
src/osd/PGLog.cc | 39 +-
src/osd/PGLog.h | 11 +-
src/osd/ReplicatedPG.cc | 84 +-
src/osd/ReplicatedPG.h | 5 +-
src/osd/osd_types.h | 9 +-
src/osdc/Objecter.cc | 2 +-
src/pybind/rados.py | 17 +-
src/rgw/rgw_civetweb.cc | 16 +
src/rgw/rgw_civetweb.h | 1 +
src/rgw/rgw_common.h | 4 +-
src/rgw/rgw_main.cc | 34 +-
src/rgw/rgw_op.cc | 28 +-
src/rgw/rgw_op.h | 3 +-
src/rgw/rgw_rados.cc | 35 +-
src/rgw/rgw_rados.h | 7 +-
src/rgw/rgw_rest.cc | 67 +-
src/rgw/rgw_rest.h | 2 +
src/rgw/rgw_rest_s3.cc | 100 +-
src/rgw/rgw_rest_swift.cc | 46 +-
src/rgw/rgw_swift.cc | 2 +
src/test/librados/misc.cc | 19 +
src/test/mon/moncap.cc | 5 +-
src/test/objectstore/test_idempotent_sequence.cc | 4 +-
src/tools/Makefile.am | 16 +-
src/tools/ceph_filestore_dump.cc | 1429 ---------
src/tools/ceph_filestore_tool.cc | 260 --
src/tools/ceph_objectstore_tool.cc | 3086 ++++++++++++++++++++
src/vstart.sh | 2 +-
test-driver | 139 +
128 files changed, 10970 insertions(+), 6663 deletions(-)
diff --cc debian/changelog
index ba4f3fc,a1394e4..390d069
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,28 +1,34 @@@
+ ceph (0.80.10-2) unstable; urgency=medium
+
+ * [2d1482] Add upstream patch to fix building without libatomic-ops
+ (Closes: #801477)
+ * [4d408f] Remove build dependency on libatomic-ops-dev for armel
+
+ -- Gaudenz Steinlin <gaudenz at debian.org> Mon, 12 Oct 2015 18:47:17 +0200
+
+ ceph (0.80.10-1) unstable; urgency=medium
+
+ * [469085] Imported Upstream version 0.80.10
+ * [3d6549] Refresh backfill-prio.patch
+ * [c8b478] Add upstream patch to fix compiling with boost 1.58
+ (Closes: #795178)
+ * [6fc46b] Add bug-11860.patch to fix quotes in bucket header for rgw
+ * [d3c87f] Add upstream patch to fix CVE-2015-5245 (Closes: #798567)
+ * [d29942] ceph-test: ceph_filestore_dump and ceph_filestore_tool
+ replaced by ceph-objectstore-tool
+ * [ad1248] Add upstream patches to fix compiling with boost 1.57
+ * [186e1e] Use dh_bash-completion to install bash completions
+ * [901a83] Remove no longer needed check for dh-autoreconf>=6
+ * [b5feba] Add build dependency on dh-python
+
+ -- Gaudenz Steinlin <gaudenz at debian.org> Wed, 07 Oct 2015 11:54:58 +0200
+
+ceph (0.80.9-2~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Gaudenz Steinlin <gaudenz at debian.org> Fri, 29 May 2015 15:03:35 +0200
+
ceph (0.80.9-2) unstable; urgency=medium
* [70fc1d] Add NEWS entry about CRUSH issues fixed in 0.80.9
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git
More information about the Pkg-ceph-commits
mailing list