[Pkg-ceph-commits] [ceph] 01/02: Merge tag 'upstream/0.87' into experimental

[Dmitry Smirnov]

This is an automated email from the git hooks/post-receive script.

onlyjob pushed a commit to branch experimental
in repository ceph.

commit a14af10
Merge: 9789e76 b2c1536
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Thu Oct 30 01:41:07 2014

    Merge tag 'upstream/0.87' into experimental
    
    Upstream version 0.87

 AUTHORS                                            |   2 +
 ChangeLog                                          |  45 ++++++-
 src/.git_version                                   |   2 +-
 src/Makefile.in                                    | 127 +++++++++++++++++--
 src/common/Timer.cc                                |   4 +
 src/common/buffer.cc                               |  91 ++++++++------
 src/common/shared_cache.hpp                        |  50 +++++---
 src/erasure-code/ErasureCode.cc                    |  71 +++++++----
 src/erasure-code/ErasureCode.h                     |   8 +-
 src/include/buffer.h                               |  15 ++-
 src/include/rados/buffer.h                         |  15 ++-
 src/java/native/libcephfs_jni.cc                   |  18 +--
 src/mds/InoTable.cc                                |   7 +-
 src/mds/Server.cc                                  |   1 +
 src/mon/Monitor.cc                                 |  15 ++-
 src/os/FDCache.h                                   |   6 +-
 src/os/FileStore.cc                                |   2 +-
 src/os/LevelDBStore.h                              |   5 +-
 src/os/RocksDBStore.h                              |   5 +-
 src/osd/PG.cc                                      |   8 +-
 src/osd/ReplicatedPG.cc                            |   2 +-
 src/osd/osd_types.cc                               |  53 ++++++--
 src/osd/osd_types.h                                |  19 +++
 src/osdc/ObjectCacher.cc                           |  28 +----
 src/osdc/ObjectCacher.h                            |   1 -
 src/osdc/Objecter.cc                               |  74 +++++++++---
 src/osdc/Objecter.h                                |  13 +-
 src/test/Makefile.am                               |   5 +
 src/test/bufferlist.cc                             |  46 +++++++
 src/test/common/test_shared_cache.cc               |  77 ++++++++++++
 src/test/erasure-code/Makefile.am                  |  14 ++-
 src/test/erasure-code/TestErasureCode.cc           | 134 +++++++++++++++++++++
 .../erasure-code/ceph_erasure_code_benchmark.cc    |   3 +
 33 files changed, 772 insertions(+), 194 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git