[Pkg-ceph-commits] [ceph] 01/04: Merge branch 'upstream' into ubuntu
James Downing Page
jamespage at moszumanska.debian.org
Tue Apr 8 22:20:16 UTC 2014
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch ubuntu
in repository ceph.
commit 77fa100d25b4d30e8b928a0cecc2b235650408c1
Merge: 64bdf0c e53c0ed
Author: James Page <jamespage at debian.org>
Date: Tue Apr 8 08:58:27 2014 +0100
Merge branch 'upstream' into ubuntu
0.79 release
Makefile.am | 4 +-
Makefile.in | 20 +-
README | 7 +-
aclocal.m4 | 1 +
ceph.spec | 69 +-
ceph.spec.in | 67 +-
configure | 355 ++-
configure.ac | 5 +-
m4/ax_intel.m4 | 70 +
man/Makefile.in | 16 +-
src/.git_version | 4 +-
src/Makefile-env.am | 2 +-
src/Makefile.am | 21 +-
src/Makefile.in | 2047 ++++++++++++---
src/acconfig.h.in | 21 +
src/arch/intel.c | 45 +-
src/arch/intel.h | 4 +
src/auth/Crypto.cc | 2 +-
src/auth/cephx/CephxProtocol.cc | 2 +-
src/ceph-disk | 2 +-
src/ceph-post-file.in | 91 +-
src/ceph_mds.cc | 57 +-
src/client/Client.cc | 437 ++--
src/client/Client.h | 25 +-
src/client/Inode.cc | 10 +-
src/client/Inode.h | 13 +-
src/client/MetaRequest.h | 6 +-
src/client/ObjecterWriteback.h | 4 +-
src/client/SyntheticClient.cc | 2 +-
src/client/fuse_ll.cc | 7 +-
src/cls/user/cls_user_types.cc | 1 +
src/cls/user/cls_user_types.h | 9 +-
src/common/Formatter.cc | 2 +-
src/common/Formatter.h | 2 +-
src/common/Makefile.am | 9 +-
src/common/OutputDataSocket.cc | 14 +-
src/common/PrioritizedQueue.h | 17 +-
src/common/admin_socket.cc | 17 +-
src/common/buffer.cc | 10 +-
src/common/ceph_argparse.cc | 2 +-
src/common/ceph_crypto.cc | 6 +
src/common/config_opts.h | 18 +-
src/common/hobject.h | 5 +
src/common/lockdep.cc | 16 +-
src/common/pipe.c | 4 +-
src/common/safe_io.c | 10 +-
src/erasure-code/ErasureCodePlugin.cc | 64 +-
src/erasure-code/ErasureCodePlugin.h | 8 +-
src/erasure-code/Makefile.am | 3 +-
src/erasure-code/jerasure/ErasureCodeJerasure.cc | 40 +-
.../jerasure/ErasureCodePluginJerasure.cc | 6 +-
.../jerasure/ErasureCodePluginSelectJerasure.cc | 69 +
src/erasure-code/jerasure/Makefile.am | 116 +-
src/erasure-code/jerasure/cauchy.h | 53 -
src/erasure-code/jerasure/galois.c | 833 ------
src/erasure-code/jerasure/galois.h | 111 -
.../jerasure/gf-complete/include/gf_complete.h | 192 ++
.../jerasure/gf-complete/include/gf_general.h | 61 +
.../jerasure/gf-complete/include/gf_int.h | 200 ++
.../jerasure/gf-complete/include/gf_method.h | 20 +
.../jerasure/gf-complete/include/gf_rand.h | 22 +
src/erasure-code/jerasure/gf-complete/src/gf.c | 1026 ++++++++
.../jerasure/gf-complete/src/gf_general.c | 538 ++++
.../jerasure/gf-complete/src/gf_method.c | 185 ++
.../jerasure/gf-complete/src/gf_rand.c | 80 +
.../jerasure/gf-complete/src/gf_w128.c | 1758 +++++++++++++
src/erasure-code/jerasure/gf-complete/src/gf_w16.c | 2489 ++++++++++++++++++
src/erasure-code/jerasure/gf-complete/src/gf_w32.c | 2741 ++++++++++++++++++++
src/erasure-code/jerasure/gf-complete/src/gf_w4.c | 2081 +++++++++++++++
src/erasure-code/jerasure/gf-complete/src/gf_w64.c | 2244 ++++++++++++++++
src/erasure-code/jerasure/gf-complete/src/gf_w8.c | 2456 ++++++++++++++++++
.../jerasure/gf-complete/src/gf_wgen.c | 1019 ++++++++
.../jerasure/jerasure/include/cauchy.h | 45 +
.../jerasure/jerasure/include/galois.h | 99 +
.../jerasure/{ => jerasure/include}/jerasure.h | 86 +-
.../jerasure/jerasure/include/liberation.h | 47 +
.../jerasure/jerasure/include/reed_sol.h | 50 +
.../jerasure/{ => jerasure/src}/cauchy.c | 87 +-
src/erasure-code/jerasure/jerasure/src/galois.c | 353 +++
.../jerasure/{ => jerasure/src}/jerasure.c | 117 +-
.../jerasure/{ => jerasure/src}/liberation.c | 87 +-
.../jerasure/{ => jerasure/src}/reed_sol.c | 213 +-
src/erasure-code/jerasure/liberation.h | 56 -
src/erasure-code/jerasure/reed_sol.h | 59 -
src/erasure-code/jerasure/vectorop.h | 51 -
src/global/global_init.cc | 30 +-
src/global/global_init.h | 12 +-
src/global/pidfile.cc | 4 +-
src/include/ceph_features.h | 2 +
src/include/cephfs/libcephfs.h | 6 +
src/include/compat.h | 8 +
src/include/frag.h | 2 +-
src/include/msgr.h | 2 +
src/include/rados/librados.h | 11 +
src/include/types.h | 2 +-
src/init-ceph.in | 6 +-
src/init-radosgw | 1 +
src/init-rbdmap | 14 +-
src/java/Makefile.in | 16 +-
src/java/test/com/ceph/fs/CephMountTest.java | 9 +-
src/libcephfs.cc | 45 +
src/librados/AioCompletionImpl.h | 2 +-
src/librados/IoCtxImpl.cc | 10 +-
src/librados/IoCtxImpl.h | 4 +-
src/librados/RadosClient.cc | 4 +-
src/librados/librados.cc | 19 +-
src/librbd/AioRequest.cc | 3 +-
src/librbd/LibrbdWriteback.cc | 2 +-
src/librbd/LibrbdWriteback.h | 4 +-
src/librbd/internal.cc | 7 +
src/libs3/debian/changelog | 5 +
src/libs3/debian/changelog.Debian | 6 +
src/libs3/debian/control | 12 +
src/libs3/debian/control.dev | 26 +
src/libs3/debian/postinst | 3 +
src/log/Log.cc | 4 +-
src/logrotate.conf | 1 +
src/make_version | 11 +-
src/mds/AnchorServer.h | 9 +-
src/mds/CDir.cc | 29 +-
src/mds/CDir.h | 8 +-
src/mds/CInode.cc | 127 +-
src/mds/CInode.h | 6 +
src/mds/Capability.h | 4 +-
src/mds/Dumper.cc | 162 +-
src/mds/Dumper.h | 63 +-
src/mds/InoTable.cc | 31 +
src/mds/InoTable.h | 13 +-
src/mds/Locker.cc | 12 +-
src/mds/LogEvent.h | 1 +
src/mds/LogSegment.h | 2 +-
src/mds/MDBalancer.cc | 7 +-
src/mds/MDCache.cc | 342 +--
src/mds/MDCache.h | 37 +-
src/mds/MDLog.cc | 11 +-
src/mds/MDS.cc | 19 +-
src/mds/MDS.h | 10 +-
src/mds/MDSMap.h | 14 +-
src/mds/MDSTable.cc | 4 +-
src/mds/MDSTable.h | 2 +-
src/mds/MDSTableServer.h | 4 +-
src/mds/MDSUtility.cc | 160 ++
src/mds/MDSUtility.h | 58 +
src/mds/Makefile.am | 4 +-
src/mds/Migrator.cc | 18 +-
src/mds/Migrator.h | 5 +-
src/mds/Mutation.cc | 6 +-
src/mds/Mutation.h | 6 +-
src/mds/Resetter.cc | 80 +-
src/mds/Resetter.h | 45 +-
src/mds/Server.cc | 164 +-
src/mds/SessionMap.h | 10 +-
src/mds/SnapServer.cc | 81 +
src/mds/SnapServer.h | 13 +-
src/mds/events/EMetaBlob.h | 4 +-
src/mds/flock.h | 10 +
src/mds/journal.cc | 28 +-
src/mds/mdstypes.cc | 4 +-
src/mds/mdstypes.h | 10 +-
src/messages/MClientRequest.h | 4 +-
src/messages/MClientRequestForward.h | 2 +-
src/messages/MDiscoverReply.h | 10 +-
src/messages/MGetPoolStats.h | 2 +-
src/messages/MGetPoolStatsReply.h | 2 +-
src/messages/MMDSFindIno.h | 4 +-
src/messages/MMDSFindInoReply.h | 4 +-
src/messages/MMDSOpenIno.h | 2 +-
src/messages/MMDSOpenInoReply.h | 2 +-
src/messages/MMDSSlaveRequest.h | 3 +-
src/messages/MMonGetVersion.h | 2 +-
src/messages/MMonGetVersionReply.h | 2 +-
src/messages/MOSDOp.h | 2 +-
src/messages/MOSDSubOp.h | 2 +-
src/messages/MPoolOp.h | 4 +-
src/messages/MPoolOpReply.h | 4 +-
src/messages/MStatfs.h | 2 +-
src/messages/MStatfsReply.h | 2 +-
src/mon/LogMonitor.cc | 2 +-
src/mon/MDSMonitor.cc | 15 +-
src/mon/Makefile.am | 2 +-
src/mon/MonClient.cc | 22 +-
src/mon/MonClient.h | 4 +-
src/mon/MonCommands.h | 52 +-
src/mon/Monitor.cc | 20 +-
src/mon/Monitor.h | 4 +-
src/mon/OSDMonitor.cc | 586 ++++-
src/mon/OSDMonitor.h | 32 +-
src/mon/PGMap.cc | 41 +-
src/mon/PGMap.h | 20 +-
src/mon/PGMonitor.cc | 11 +
src/mon/Paxos.cc | 15 +-
src/msg/Accepter.cc | 4 +-
src/msg/DispatchQueue.cc | 1 +
src/msg/DispatchQueue.h | 1 +
src/msg/Message.h | 11 +-
src/msg/Pipe.cc | 86 +-
src/msg/Pipe.h | 9 +-
src/msg/SimpleMessenger.cc | 23 +-
src/ocf/Makefile.in | 16 +-
src/os/FDCache.h | 2 +-
src/os/FileJournal.cc | 6 +-
src/os/FileStore.cc | 68 +-
src/os/GenericFileStoreBackend.cc | 6 +-
src/os/HashIndex.cc | 3 +-
src/os/HashIndex.h | 5 +-
src/os/KeyValueStore.cc | 18 +-
src/os/LFNIndex.cc | 2 +-
src/os/ObjectStore.h | 469 +++-
src/osd/ECBackend.cc | 44 +-
src/osd/ECBackend.h | 16 +-
src/osd/ECMsgTypes.h | 14 +-
src/osd/Makefile.am | 2 +-
src/osd/OSD.cc | 22 +-
src/osd/OSD.h | 17 +-
src/osd/OSDMap.cc | 76 +-
src/osd/OSDMap.h | 46 +-
src/osd/OpRequest.h | 4 +-
src/osd/PG.cc | 62 +-
src/osd/PG.h | 3 +-
src/osd/PGBackend.cc | 17 +-
src/osd/PGBackend.h | 13 +-
src/osd/ReplicatedBackend.cc | 8 +-
src/osd/ReplicatedBackend.h | 10 +-
src/osd/ReplicatedPG.cc | 281 +-
src/osd/ReplicatedPG.h | 31 +-
src/osd/Watch.cc | 4 +-
src/osd/Watch.h | 4 +-
src/osd/osd_types.cc | 29 +-
src/osd/osd_types.h | 10 +-
src/osdc/Journaler.h | 32 +
src/osdc/ObjectCacher.cc | 8 +-
src/osdc/ObjectCacher.h | 22 +-
src/osdc/Objecter.cc | 137 +-
src/osdc/Objecter.h | 113 +-
src/osdc/WritebackHandler.h | 13 +-
src/pybind/ceph_argparse.py | 12 +-
src/pybind/rados.py | 58 +-
src/rbd.cc | 8 +-
src/rgw/logrotate.conf | 1 +
src/rgw/rgw_common.h | 63 +-
src/rgw/rgw_json_enc.cc | 4 +
src/rgw/rgw_main.cc | 18 +-
src/rgw/rgw_op.cc | 7 +
src/rgw/rgw_rados.cc | 401 ++-
src/rgw/rgw_rados.h | 38 +-
src/rgw/rgw_rest.cc | 7 +-
src/rgw/rgw_rest_s3.cc | 18 +-
src/rgw/rgw_rest_user.cc | 2 +-
src/stop.sh | 89 +-
src/test/Makefile.am | 6 +
src/test/bench/distribution.h | 6 +-
src/test/crypto_init.cc | 48 +
src/test/encoding/ceph_dencoder.cc | 19 +-
src/test/encoding/types.h | 11 +-
src/test/erasure-code/Makefile.am | 30 +-
src/test/erasure-code/TestErasureCodeJerasure.cc | 46 +-
src/test/erasure-code/TestErasureCodePlugin.cc | 22 +-
.../erasure-code/TestErasureCodePluginJerasure.cc | 183 +-
src/test/erasure-code/TestJerasurePluginGeneric.cc | 23 +
src/test/erasure-code/TestJerasurePluginSSE3.cc | 23 +
src/test/erasure-code/TestJerasurePluginSSE4.cc | 23 +
src/test/erasure-code/ceph_erasure_code.cc | 22 +-
.../erasure-code/ceph_erasure_code_benchmark.cc | 24 +-
src/test/libcephfs/test.cc | 3 +
src/test/librados/TestCase.cc | 93 +
src/test/librados/TestCase.h | 37 +
src/test/librados/aio.cc | 17 +-
src/test/librados/io.cc | 459 ++++
src/test/librados/list.cc | 292 +++
src/test/librados/lock.cc | 181 ++
src/test/librados/snapshots.cc | 336 +++
src/test/librados/stat.cc | 118 +
src/test/librados/test.cc | 116 +
src/test/librados/test.h | 5 +
src/test/librados/tier.cc | 2114 +++++++++++++++
src/test/librados/watch_notify.cc | 54 +
src/test/librbd/test_librbd.cc | 2 +
src/test/mon/PGMap.cc | 16 +-
src/test/mon/mon-test-helpers.sh | 35 +-
src/test/multi_stress_watch.cc | 124 +-
src/test/osd/RadosModel.h | 27 +-
src/test/osd/TestRados.cc | 6 +-
src/test/osd/osd-test-helpers.sh | 1 +
src/test/osdc/FakeWriteback.cc | 2 +-
src/test/osdc/FakeWriteback.h | 9 +-
src/test/system/rados_list_parallel.cc | 9 +
src/test/test_filejournal.cc | 4 +-
src/tools/Makefile.am | 14 +-
src/tools/ceph-client-debug.cc | 179 ++
src/tools/ceph_conf.cc | 4 +-
...ph-filestore-dump.cc => ceph_filestore_dump.cc} | 144 +-
...ph-filestore-tool.cc => ceph_filestore_tool.cc} | 0
.../{ceph-kvstore-tool.cc => ceph_kvstore_tool.cc} | 0
...ceph-monstore-tool.cc => ceph_monstore_tool.cc} | 0
.../{ceph-osdomap-tool.cc => ceph_osdomap_tool.cc} | 0
src/tools/rados/rados.cc | 65 +-
src/tools/scratchtoolpp.cc | 6 +-
src/vstart.sh | 7 +-
298 files changed, 29308 insertions(+), 4271 deletions(-)
--
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-ceph/ceph.git
More information about the Pkg-ceph-commits
mailing list