[Pkg-ceph-commits] [ceph] 01/05: Merge branch 'master' into wheezy-backports
Gaudenz Steinlin
gaudenz at moszumanska.debian.org
Wed May 6 07:01:44 UTC 2015
This is an automated email from the git hooks/post-receive script.
gaudenz pushed a commit to annotated tag 0.80.9-1_bpo70+1
in repository ceph.
commit 52ad068c4bb8d2e2a1381fb2c4f61453192d1316
Merge: cac0523 28307ac
Author: Gaudenz Steinlin <gaudenz at debian.org>
Date: Sun May 3 18:57:59 2015 +0200
Merge branch 'master' into wheezy-backports
Conflicts:
debian/control
.gitignore | 1 +
ceph.spec | 65 +-
ceph.spec.in | 63 +-
configure | 22 +-
configure.ac | 2 +-
debian/changelog | 9 +
debian/control | 2 +-
debian/copyright | 2 +
debian/patches/backfill-prio.patch | 10 +-
debian/patches/firefly-latest.patch | 30 -
debian/patches/p2139.patch | 39 -
debian/patches/series | 3 +-
debian/patches/use_system_jerasure.patch | 117 +
man/ceph.8 | 2307 +++++++++++++++++++-
src/.git_version | 4 +-
src/Makefile-env.am | 1 +
src/Makefile.am | 1 +
src/Makefile.in | 358 ++-
src/ceph-disk | 114 +-
src/ceph.in | 6 +-
src/ceph_mon.cc | 20 +
src/civetweb/civetweb.h | 24 +-
src/civetweb/include/civetweb.h | 24 +-
src/civetweb/include/civetweb_conf.h | 6 +
src/civetweb/src/civetweb.c | 771 +++++--
src/client/Client.cc | 374 +++-
src/client/Client.h | 23 +-
src/client/Fh.h | 8 +-
src/client/Inode.h | 11 +-
src/client/MetaRequest.h | 14 +-
src/client/fuse_ll.cc | 77 +-
src/common/Makefile.am | 3 +-
src/common/Thread.cc | 3 +-
src/common/Thread.h | 1 +
src/common/TrackedOp.cc | 2 +-
src/common/WorkQueue.cc | 4 +
src/common/ceph_crypto.h | 8 +-
src/common/config.cc | 4 +-
src/common/config_opts.h | 7 +-
src/common/crc32c_intel_fast_asm.S | 2 +
src/common/crc32c_intel_fast_zero_asm.S | 2 +
src/common/hobject.cc | 4 +-
src/common/io_priority.cc | 4 +-
src/common/util.cc | 22 +
src/crush/CrushCompiler.cc | 4 +
src/crush/CrushTester.cc | 16 +-
src/crush/CrushTester.h | 9 +
src/crush/CrushWrapper.cc | 108 +-
src/crush/CrushWrapper.h | 75 +-
src/crush/builder.c | 243 ++-
src/crush/builder.h | 11 +-
src/crush/crush.h | 8 +
src/crush/mapper.c | 16 +-
src/include/ceph_features.h | 2 +
src/include/ceph_fs.h | 6 +-
src/include/util.h | 24 +
src/init-radosgw.sysv | 6 +-
src/librbd/AioCompletion.h | 12 +
src/librbd/ImageCtx.cc | 14 +-
src/librbd/ImageCtx.h | 10 +-
src/librbd/internal.cc | 81 +-
src/mds/CInode.h | 1 +
src/mds/Dumper.cc | 23 +-
src/mds/Locker.cc | 20 +-
src/mds/MDCache.cc | 8 +-
src/mds/Makefile.am | 1 -
src/mds/Server.cc | 21 +-
src/mds/flock.cc | 69 +-
src/mds/flock.h | 2 +
src/mds/mdstypes.h | 4 +-
src/messages/MClientReconnect.h | 6 +-
src/mon/DataHealthService.cc | 39 +-
src/mon/MonCommands.h | 12 +
src/mon/Monitor.cc | 27 +-
src/mon/MonitorDBStore.h | 27 +-
src/mon/OSDMonitor.cc | 169 +-
src/mon/PGMap.cc | 37 +-
src/mon/PGMonitor.cc | 1 +
src/mon/Paxos.cc | 169 +-
src/mon/Paxos.h | 44 +
src/mon/mon_types.h | 45 +-
src/os/FileJournal.cc | 89 +-
src/osd/ECBackend.cc | 50 +-
src/osd/OSD.cc | 108 +-
src/osd/OSD.h | 6 +-
src/osd/OSDMap.h | 12 +
src/osd/PG.cc | 106 +-
src/osd/PG.h | 19 +-
src/osd/ReplicatedPG.cc | 112 +-
src/osd/ReplicatedPG.h | 6 +-
src/osd/Watch.h | 7 +-
src/osd/osd_types.cc | 14 +-
src/osdc/ObjectCacher.cc | 47 +-
src/osdc/ObjectCacher.h | 3 +
src/osdc/Objecter.cc | 9 +-
src/pybind/rados.py | 8 +-
src/rgw/Makefile.am | 20 +-
src/rgw/rgw_admin.cc | 14 +-
src/rgw/rgw_civetweb.cc | 6 +-
src/rgw/rgw_civetweb_log.cc | 14 +
src/rgw/rgw_civetweb_log.h | 6 +
src/rgw/rgw_common.cc | 5 +-
src/rgw/rgw_common.h | 2 +-
src/rgw/rgw_fcgi.cc | 4 +-
src/rgw/rgw_http_client.cc | 52 +-
src/rgw/rgw_json_enc.cc | 2 +-
src/rgw/rgw_main.cc | 35 +-
src/rgw/rgw_op.cc | 88 +-
src/rgw/rgw_op.h | 4 +-
src/rgw/rgw_rados.cc | 161 +-
src/rgw/rgw_rados.h | 19 +-
src/rgw/rgw_rest.cc | 38 +-
src/rgw/rgw_rest.h | 1 -
src/rgw/rgw_rest_s3.cc | 47 +-
src/rgw/rgw_rest_swift.cc | 30 +-
src/rgw/rgw_swift.cc | 32 +-
src/rgw/rgw_swift.h | 1 +
src/rgw/rgw_swift_auth.cc | 9 +-
src/rgw/rgw_swift_auth.h | 2 +-
src/rgw/rgw_user.cc | 11 +-
src/test/Makefile.am | 10 +-
src/test/cli/crushtool/add-item-in-tree.t | 10 +
src/test/cli/crushtool/adjust-item-weight.t | 17 +
src/test/cli/crushtool/build.t | 2 +-
src/test/cli/crushtool/help.t | 1 +
src/test/cli/crushtool/set-choose.t | 9 +-
src/test/cli/crushtool/simple.template.adj.one | 56 +
src/test/cli/crushtool/simple.template.adj.three | 64 +
src/test/cli/crushtool/simple.template.adj.two | 64 +
src/test/cli/crushtool/test-map-bobtail-tunables.t | 2 +-
src/test/cli/crushtool/test-map-firefly-tunables.t | 2 +-
src/test/cli/crushtool/test-map-firstn-indep.t | 14 +
src/test/cli/crushtool/test-map-firstn-indep.txt | 443 ++++
src/test/cli/crushtool/test-map-indep.t | 2 +-
src/test/cli/crushtool/test-map-legacy-tunables.t | 2 +-
src/test/cli/crushtool/test-map-tries-vs-retries.t | 2 +-
src/test/cli/crushtool/test-map-vary-r-0.t | 2 +-
src/test/cli/crushtool/test-map-vary-r-1.t | 2 +-
src/test/cli/crushtool/test-map-vary-r-2.t | 2 +-
src/test/cli/crushtool/test-map-vary-r-3.t | 2 +-
src/test/cli/crushtool/test-map-vary-r-4.t | 2 +-
src/test/cli/crushtool/tree.template | Bin 0 -> 376 bytes
src/test/cli/crushtool/tree.template.final | 70 +
src/test/cli/osdmaptool/create-print.t | 1 +
src/test/cli/osdmaptool/create-racks.t | 1 +
src/test/cli/osdmaptool/crush.t | 2 +-
src/test/cli/osdmaptool/help.t | 1 +
src/test/cli/osdmaptool/missing-argument.t | 1 +
src/test/cli/osdmaptool/test-map-pgs.t | 4 +-
src/test/common/histogram.cc | 113 +-
src/test/common/test_io_priority.cc | 51 +
src/test/crush/TestCrushWrapper.cc | 270 +++
src/test/crush/indep.cc | 33 +-
src/test/erasure-code/Makefile.am | 8 +
src/test/erasure-code/TestErasureCodeJerasure.cc | 30 -
.../ceph_erasure_code_non_regression.cc | 325 +++
src/test/libcephfs/test.cc | 1 +
src/test/librados/misc.cc | 6 +-
src/test/librados/snapshots.cc | 18 +
src/test/librados/tier.cc | 76 +
src/test/librbd/test_librbd.cc | 106 +
src/test/mon/mon-test-helpers.sh | 3 +-
src/tools/crushtool.cc | 16 +-
src/tools/osdmaptool.cc | 11 +-
164 files changed, 7433 insertions(+), 1567 deletions(-)
diff --cc debian/changelog
index f15b020,d7b53b3..0a9cbcb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,18 @@@
+ ceph (0.80.7-2) unstable; urgency=medium
+
+ * Team upload.
+ * Build-Depends: +libjerasure-dev (>= 2.0.0-2~)
+ * New patch to use system "jerasure" library instead of its bundled copy.
+ * Removed myself from Uploaders.
+
+ -- Dmitry Smirnov <onlyjob at debian.org> Thu, 11 Dec 2014 12:55:38 +1100
+
+ceph (0.80.7-1~bpo70+1) wheezy-backports; urgency=medium
+
+ * Rebuild for wheezy-backports.
+
+ -- Gaudenz Steinlin <gaudenz at debian.org> Wed, 05 Nov 2014 14:19:17 +0100
+
ceph (0.80.7-1) unstable; urgency=medium
* New upstream release [October 2014].
--
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