Merge lp://staging/~tribaal/ubuntu/trusty/ceph/add-zap-fix-patch into lp://staging/ubuntu/trusty/ceph

.pc/applied-patches (+1/-0)
.pc/increaseFileLimit.patch/src/upstart/ceph-osd.conf (+54/-0)
Makefile.in (+184/-137)
aclocal.m4 (+430/-334)
ar-lib (+10/-5)
autogen.sh (+9/-0)
ceph.spec (+161/-86)
ceph.spec.in (+160/-85)
compile (+68/-31)
config.guess (+106/-78)
config.sub (+66/-48)
configure (+1051/-449)
configure.ac (+15/-5)
debian/ceph-test.install (+1/-2)
debian/ceph.install (+1/-0)
debian/changelog (+81/-0)
debian/control (+1/-1)
debian/patches/increaseFileLimit.patch (+32/-0)
debian/patches/series (+2/-0)
debian/patches/zap-in-two-phases.patch (+20/-0)
depcomp (+296/-193)
install-sh (+7/-7)
ltmain.sh (+2/-2)
m4/ac_prog_javac.m4 (+2/-2)
m4/libtool.m4 (+25/-29)
man/Makefile.am (+1/-0)
man/Makefile.in (+92/-40)
man/ceph-disk.8 (+272/-0)
man/ceph.8 (+2427/-71)
man/crushtool.8 (+1/-1)
missing (+159/-275)
py-compile (+16/-7)
src/.git_version (+2/-2)
src/Makefile-env.am (+4/-0)
src/Makefile.am (+1/-0)
src/Makefile.in (+2520/-1850)
src/acconfig.h.in (+13/-9)
src/auth/AuthClientHandler.h (+15/-21)
src/auth/cephx/CephxClientHandler.cc (+22/-11)
src/auth/cephx/CephxClientHandler.h (+17/-13)
src/auth/cephx/CephxProtocol.cc (+7/-7)
src/auth/cephx/CephxProtocol.h (+4/-4)
src/auth/none/AuthNoneClientHandler.h (+12/-8)
src/auth/unknown/AuthUnknownClientHandler.h (+13/-9)
src/brag/README.md (+2/-1)
src/brag/client/ceph-brag (+210/-38)
src/brag/server/ceph_brag/json.py (+2/-1)
src/brag/server/ceph_brag/model/db.py (+4/-2)
src/ceph-disk (+336/-146)
src/ceph.in (+31/-10)
src/ceph_common.sh (+21/-2)
src/ceph_mon.cc (+44/-6)
src/ceph_osd.cc (+20/-0)
src/cephfs.cc (+7/-13)
src/civetweb/civetweb.h (+118/-50)
src/civetweb/include/civetweb.h (+118/-50)
src/civetweb/include/civetweb_conf.h (+6/-0)
src/civetweb/src/civetweb.c (+1220/-507)
src/client/Client.cc (+599/-139)
src/client/Client.h (+28/-7)
src/client/Fh.h (+7/-1)
src/client/Inode.cc (+4/-4)
src/client/Inode.h (+9/-4)
src/client/MetaRequest.h (+6/-8)
src/client/MetaSession.cc (+1/-0)
src/client/MetaSession.h (+1/-0)
src/client/SyntheticClient.cc (+3/-4)
src/client/fuse_ll.cc (+75/-6)
src/cls/lock/cls_lock.cc (+4/-3)
src/cls/rbd/cls_rbd.cc (+16/-11)
src/cls/rgw/cls_rgw.cc (+3/-2)
src/cls/rgw/cls_rgw_types.h (+1/-1)
src/common/Finisher.h (+9/-0)
src/common/LogClient.cc (+2/-1)
src/common/Makefile.am (+5/-1)
src/common/Preforker.h (+2/-1)
src/common/RWLock.h (+29/-9)
src/common/Thread.cc (+33/-2)
src/common/Thread.h (+6/-0)
src/common/TrackedOp.cc (+1/-1)
src/common/WorkQueue.cc (+32/-2)
src/common/WorkQueue.h (+4/-0)
src/common/blkdev.cc (+1/-1)
src/common/buffer.cc (+11/-7)
src/common/ceph_crypto.h (+5/-3)
src/common/code_environment.h (+1/-0)
src/common/common_init.cc (+1/-1)
src/common/config.cc (+9/-8)
src/common/config_opts.h (+33/-1)
src/common/crc32c_intel_fast_asm.S (+2/-0)
src/common/crc32c_intel_fast_zero_asm.S (+2/-0)
src/common/errno.cc (+14/-1)
src/common/histogram.h (+4/-0)
src/common/hobject.cc (+16/-2)
src/common/io_priority.cc (+54/-0)
src/common/io_priority.h (+44/-0)
src/common/obj_bencher.cc (+21/-38)
src/common/obj_bencher.h (+3/-3)
src/common/random_cache.hpp (+111/-0)
src/common/str_map.cc (+1/-1)
src/common/strtol.cc (+43/-0)
src/common/strtol.h (+5/-0)
src/common/utf8.c (+2/-2)
src/common/utf8.h (+12/-0)
src/common/util.cc (+22/-0)
src/crush/CrushCompiler.cc (+7/-2)
src/crush/CrushTester.cc (+8/-8)
src/crush/CrushTester.h (+9/-0)
src/crush/CrushWrapper.cc (+194/-47)
src/crush/CrushWrapper.h (+91/-24)
src/crush/builder.c (+186/-65)
src/crush/builder.h (+6/-5)
src/crush/crush.h (+8/-0)
src/crush/mapper.c (+12/-4)
src/erasure-code/ErasureCodeInterface.h (+1/-1)
src/erasure-code/ErasureCodePlugin.cc (+33/-4)
src/erasure-code/ErasureCodePlugin.h (+3/-0)
src/erasure-code/jerasure/ErasureCodeJerasure.cc (+6/-2)
src/erasure-code/jerasure/ErasureCodePluginJerasure.cc (+19/-0)
src/global/global_init.cc (+9/-1)
src/gtest/Makefile.in (+671/-269)
src/gtest/aclocal.m4 (+474/-283)
src/gtest/build-aux/compile (+347/-0)
src/gtest/build-aux/config.guess (+106/-78)
src/gtest/build-aux/config.sub (+66/-48)
src/gtest/build-aux/depcomp (+296/-193)
src/gtest/build-aux/install-sh (+7/-7)
src/gtest/build-aux/ltmain.sh (+2/-2)
src/gtest/build-aux/missing (+159/-275)
src/gtest/build-aux/test-driver (+139/-0)
src/gtest/configure (+402/-238)
src/gtest/m4/libtool.m4 (+25/-29)
src/include/atomic.h (+70/-53)
src/include/ceph_features.h (+4/-0)
src/include/ceph_fs.h (+4/-2)
src/include/encoding.h (+2/-2)
src/include/intarith.h (+1/-1)
src/include/memory.h (+2/-0)
src/include/rados.h (+6/-0)
src/include/rados/librados.h (+18/-6)
src/include/rados/librados.hpp (+11/-0)
src/include/rados/memory.h (+2/-0)
src/include/rbd/librbd.h (+9/-0)
src/include/rbd/librbd.hpp (+8/-0)
src/include/str_map.h (+1/-1)
src/include/util.h (+24/-0)
src/include/utime.h (+3/-3)
src/init-ceph.in (+43/-8)
src/init-radosgw (+1/-7)
src/init-radosgw.sysv (+12/-9)
src/java/Makefile.am (+2/-2)
src/java/Makefile.in (+83/-24)
src/java/native/libcephfs_jni.cc (+1/-1)
src/librados/AioCompletionImpl.h (+2/-2)
src/librados/IoCtxImpl.cc (+6/-13)
src/librados/RadosClient.cc (+23/-4)
src/librados/librados.cc (+32/-11)
src/librbd/AioCompletion.h (+12/-0)
src/librbd/ImageCtx.cc (+26/-10)
src/librbd/ImageCtx.h (+9/-3)
src/librbd/internal.cc (+118/-52)
src/librbd/internal.h (+2/-0)
src/librbd/librbd.cc (+12/-0)
src/logrotate.conf (+1/-1)
src/mds/CDentry.h (+2/-2)
src/mds/CDir.cc (+12/-9)
src/mds/CDir.h (+5/-4)
src/mds/CInode.cc (+10/-6)
src/mds/CInode.h (+3/-2)
src/mds/Capability.h (+9/-12)
src/mds/Dumper.cc (+9/-14)
src/mds/Locker.cc (+105/-75)
src/mds/Locker.h (+35/-36)
src/mds/LogSegment.h (+1/-1)
src/mds/MDCache.cc (+220/-205)
src/mds/MDCache.h (+41/-39)
src/mds/MDLog.cc (+12/-7)
src/mds/MDLog.h (+5/-4)
src/mds/MDS.cc (+49/-22)
src/mds/MDS.h (+2/-2)
src/mds/Makefile.am (+0/-1)
src/mds/Migrator.cc (+24/-24)
src/mds/Migrator.h (+5/-7)
src/mds/Mutation.cc (+36/-37)
src/mds/Mutation.h (+16/-27)
src/mds/Server.cc (+205/-208)
src/mds/Server.h (+92/-85)
src/mds/SessionMap.h (+2/-2)
src/mds/SimpleLock.h (+11/-12)
src/mds/flock.cc (+34/-35)
src/mds/flock.h (+2/-0)
src/mds/journal.cc (+2/-2)
src/mds/mdstypes.h (+3/-1)
src/messages/MAuthReply.h (+2/-2)
src/messages/MClientReconnect.h (+3/-3)
src/messages/MClientReply.h (+2/-2)
src/messages/MForward.h (+1/-1)
src/messages/MMonProbe.h (+13/-2)
src/messages/MOSDOpReply.h (+2/-2)
src/messages/MOSDSubOp.h (+18/-1)
src/messages/MWatchNotify.h (+25/-9)
src/mon/AuthMonitor.cc (+13/-12)
src/mon/ConfigKeyService.cc (+1/-0)
src/mon/ConfigKeyService.h (+3/-5)
src/mon/DataHealthService.cc (+27/-36)
src/mon/DataHealthService.h (+2/-1)
src/mon/Elector.cc (+9/-2)
src/mon/Elector.h (+0/-3)
src/mon/HealthMonitor.cc (+4/-8)
src/mon/HealthMonitor.h (+3/-2)
src/mon/HealthService.h (+3/-2)
src/mon/Makefile.am (+5/-2)
src/mon/MonCap.cc (+3/-3)
src/mon/MonCap.h (+4/-4)
src/mon/MonClient.cc (+2/-7)
src/mon/MonCommands.h (+31/-12)
src/mon/Monitor.cc (+151/-29)
src/mon/Monitor.h (+10/-1)
src/mon/MonitorDBStore.h (+25/-2)
src/mon/MonitorStore.cc (+5/-8)
src/mon/MonmapMonitor.cc (+6/-0)
src/mon/OSDMonitor.cc (+522/-71)
src/mon/OSDMonitor.h (+11/-2)
src/mon/PGMap.cc (+35/-2)
src/mon/PGMonitor.cc (+87/-16)
src/mon/PGMonitor.h (+5/-1)
src/mon/Paxos.cc (+149/-23)
src/mon/Paxos.h (+46/-2)
src/mon/QuorumService.h (+2/-1)
src/mon/Session.h (+2/-1)
src/mon/mon_types.h (+26/-19)
src/mount.fuse.ceph (+3/-0)
src/mount/mtab.c (+13/-1)
src/msg/Accepter.cc (+4/-9)
src/msg/Pipe.cc (+53/-48)
src/msg/Pipe.h (+5/-2)
src/msg/SimpleMessenger.cc (+3/-0)
src/ocf/Makefile.in (+82/-23)
src/os/DBObjectMap.cc (+10/-2)
src/os/FileJournal.cc (+83/-50)
src/os/FileStore.cc (+56/-24)
src/os/FileStore.h (+74/-3)
src/os/GenericObjectMap.cc (+14/-38)
src/os/GenericObjectMap.h (+6/-31)
src/os/HashIndex.cc (+5/-1)
src/os/JournalingObjectStore.cc (+8/-2)
src/os/JournalingObjectStore.h (+8/-0)
src/os/KeyValueStore.cc (+313/-289)
src/os/KeyValueStore.h (+115/-67)
src/os/LFNIndex.cc (+80/-10)
src/os/LFNIndex.h (+6/-2)
src/os/Makefile.am (+7/-0)
src/os/MemStore.cc (+6/-1)
src/os/ObjectStore.cc (+8/-469)
src/os/ObjectStore.h (+35/-2)
src/os/Transaction.cc (+471/-0)
src/os/XfsFileStoreBackend.cc (+20/-7)
src/osd/ECBackend.cc (+57/-25)
src/osd/ECBackend.h (+5/-1)
src/osd/ECMsgTypes.cc (+33/-11)
src/osd/ECMsgTypes.h (+9/-3)
src/osd/HitSet.h (+1/-1)
src/osd/Makefile.am (+9/-4)
src/osd/OSD.cc (+385/-138)
src/osd/OSD.h (+65/-5)
src/osd/OSDMap.cc (+62/-32)
src/osd/OSDMap.h (+17/-1)
src/osd/OpRequest.cc (+1/-1)
src/osd/OpRequest.h (+4/-0)
src/osd/PG.cc (+401/-141)
src/osd/PG.h (+150/-27)
src/osd/PGBackend.cc (+10/-4)
src/osd/PGBackend.h (+13/-3)
src/osd/PGLog.cc (+77/-6)
src/osd/PGLog.h (+72/-16)
src/osd/ReplicatedBackend.cc (+13/-2)
src/osd/ReplicatedBackend.h (+5/-1)
src/osd/ReplicatedPG.cc (+1115/-389)
src/osd/ReplicatedPG.h (+99/-46)
src/osd/TierAgentState.h (+10/-3)
src/osd/Watch.h (+4/-3)
src/osd/osd_types.cc (+135/-30)
src/osd/osd_types.h (+198/-34)
src/osdc/ObjectCacher.cc (+56/-8)
src/osdc/ObjectCacher.h (+4/-0)
src/osdc/Objecter.cc (+142/-115)
src/osdc/Objecter.h (+43/-27)
src/pybind/ceph_rest_api.py (+1/-1)
src/pybind/rados.py (+60/-25)
src/pybind/rbd.py (+8/-0)
src/rgw/Makefile.am (+18/-5)
src/rgw/rgw_acl.cc (+0/-5)
src/rgw/rgw_acl_s3.cc (+0/-10)
src/rgw/rgw_acl_s3.h (+1/-0)
src/rgw/rgw_admin.cc (+14/-4)
src/rgw/rgw_bucket.cc (+3/-3)
src/rgw/rgw_civetweb.cc (+19/-3)
src/rgw/rgw_civetweb.h (+1/-0)
src/rgw/rgw_civetweb_log.cc (+14/-0)
src/rgw/rgw_civetweb_log.h (+6/-0)
src/rgw/rgw_common.cc (+8/-7)
src/rgw/rgw_common.h (+3/-3)
src/rgw/rgw_dencoder.cc (+168/-0)
src/rgw/rgw_fcgi.cc (+2/-2)
src/rgw/rgw_http_client.cc (+32/-28)
src/rgw/rgw_json_enc.cc (+2/-1)
src/rgw/rgw_main.cc (+53/-16)
src/rgw/rgw_op.cc (+219/-82)
src/rgw/rgw_op.h (+20/-14)
src/rgw/rgw_rados.cc (+402/-279)
src/rgw/rgw_rados.h (+52/-26)
src/rgw/rgw_rest.cc (+70/-42)
src/rgw/rgw_rest.h (+2/-1)
src/rgw/rgw_rest_s3.cc (+100/-56)
src/rgw/rgw_rest_swift.cc (+54/-28)
src/rgw/rgw_swift.cc (+33/-1)
src/rgw/rgw_swift.h (+1/-0)
src/rgw/rgw_swift_auth.cc (+5/-4)
src/rgw/rgw_swift_auth.h (+1/-1)
src/rgw/rgw_user.cc (+40/-31)
src/rgw/rgw_user.h (+0/-1)
src/test/Makefile.am (+13/-8)
src/test/admin_socket.cc (+1/-0)
src/test/cli/crushtool/add-item-in-tree.t (+10/-0)
src/test/cli/crushtool/adjust-item-weight.t (+17/-0)
src/test/cli/crushtool/build.t (+1/-1)
src/test/cli/crushtool/help.t (+1/-0)
src/test/cli/crushtool/set-choose.t (+6/-3)
src/test/cli/crushtool/simple.template.adj.one (+56/-0)
src/test/cli/crushtool/simple.template.adj.three (+64/-0)
src/test/cli/crushtool/simple.template.adj.two (+64/-0)
src/test/cli/crushtool/test-map-bobtail-tunables.t (+1/-1)
src/test/cli/crushtool/test-map-firefly-tunables.t (+1/-1)
src/test/cli/crushtool/test-map-firstn-indep.t (+14/-0)
src/test/cli/crushtool/test-map-firstn-indep.txt (+443/-0)
src/test/cli/crushtool/test-map-indep.t (+1/-1)
src/test/cli/crushtool/test-map-legacy-tunables.t (+1/-1)
src/test/cli/crushtool/test-map-tries-vs-retries.t (+1/-1)
src/test/cli/crushtool/test-map-vary-r-0.t (+1/-1)
src/test/cli/crushtool/test-map-vary-r-1.t (+1/-1)
src/test/cli/crushtool/test-map-vary-r-2.t (+1/-1)
src/test/cli/crushtool/test-map-vary-r-3.t (+1/-1)
src/test/cli/crushtool/test-map-vary-r-4.t (+1/-1)
src/test/cli/crushtool/tree.template.final (+70/-0)
src/test/cli/monmaptool/print-nonexistent.t (+1/-1)
src/test/cli/osdmaptool/clobber.t (+6/-6)
src/test/cli/osdmaptool/create-print.t (+7/-14)
src/test/cli/osdmaptool/create-racks.t (+7/-14)
src/test/cli/osdmaptool/crush.t (+1/-1)
src/test/cli/osdmaptool/help.t (+1/-0)
src/test/cli/osdmaptool/missing-argument.t (+1/-0)
src/test/cli/osdmaptool/test-map-pgs.t (+2/-2)
src/test/cli/radosgw-admin/help.t (+1/-1)
src/test/cls_rbd/test_cls_rbd.cc (+1/-1)
src/test/common/histogram.cc (+58/-55)
src/test/common/test_io_priority.cc (+51/-0)
src/test/crush/TestCrushWrapper.cc (+275/-0)
src/test/crush/indep.cc (+18/-15)
src/test/erasure-code/Makefile.am (+8/-0)
src/test/erasure-code/ceph_erasure_code_non_regression.cc (+325/-0)
src/test/libcephfs/test.cc (+1/-0)
src/test/librados/TestCase.cc (+83/-30)
src/test/librados/TestCase.h (+22/-4)
src/test/librados/aio.cc (+1581/-11)
src/test/librados/c_read_operations.cc (+1/-1)
src/test/librados/io.cc (+117/-61)
src/test/librados/list.cc (+48/-48)
src/test/librados/misc.cc (+28/-6)
src/test/librados/pool.cc (+10/-2)
src/test/librados/snapshots.cc (+78/-60)
src/test/librados/stat.cc (+20/-20)
src/test/librados/tier.cc (+278/-386)
src/test/librados/watch_notify.cc (+13/-10)
src/test/librbd/test_librbd.cc (+188/-0)
src/test/mon/mon-test-helpers.sh (+2/-1)
src/test/mon/moncap.cc (+3/-2)
src/test/objectstore/store_test.cc (+105/-0)
src/test/objectstore/test_idempotent_sequence.cc (+2/-2)
src/test/osd/RadosModel.h (+85/-33)
src/test/osd/TestOSDMap.cc (+55/-2)
src/test/osd/TestRados.cc (+14/-1)
src/test/osd/osd-test-helpers.sh (+1/-0)
src/test/osd/types.cc (+68/-0)
src/test/strtol.cc (+75/-0)
src/test/system/rados_list_parallel.cc (+1/-1)
src/test/system/st_rados_create_pool.cc (+1/-1)
src/test/test_stress_watch.cc (+9/-1)
src/tools/Makefile.am (+6/-14)
src/tools/ceph_filestore_dump.cc (+0/-1429)
src/tools/ceph_filestore_tool.cc (+0/-260)
src/tools/ceph_monstore_tool.cc (+1/-0)
src/tools/ceph_objectstore_tool.cc (+3086/-0)
src/tools/ceph_osdomap_tool.cc (+1/-0)
src/tools/crushtool.cc (+15/-6)
src/tools/monmaptool.cc (+3/-3)
src/tools/osdmaptool.cc (+9/-2)
src/tools/rados/rados.cc (+67/-46)
src/tools/rest_bench.cc (+9/-7)
src/tools/scratchtoolpp.cc (+3/-14)
src/upstart/ceph-osd.conf (+1/-1)
src/vstart.sh (+2/-2)
test-driver (+139/-0)