configure.ac | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 use `dpkg-architecture` instead of `arch` to get build architecture
 Fixes build in `pbuilder` on amd64 for i386.

src/sample.ceph.conf | 43 21 + 22 - 0 !
1 file changed, 21 insertions(+), 22 deletions(-)

 sample.ceph.conf updates:

 * corrected URLs.
 * more options and descriptions.

src/test/run-cli-tests | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 ask virtualenv to never download anything

configure.ac | 7 7 + 0 - 0 !
src/test/Makefile.am | 3 3 + 0 - 0 !
src/test/erasure-code/Makefile.am | 2 2 + 0 - 0 !
3 files changed, 12 insertions(+)

 disable tests that depend on network...

m4/ax_arm.m4 | 3 3 + 0 - 0 !
1 file changed, 3 insertions(+)

---

src/rocksdb/build_tools/build_detect_platform | 4 4 + 0 - 0 !
1 file changed, 4 insertions(+)

---

src/ceph-detect-init/ceph_detect_init/__init__.py | 21 1 + 20 - 0 !
src/ceph-detect-init/ceph_detect_init/debian/__init__.py | 22 11 + 11 - 0 !
src/ceph-detect-init/tests/test_all.py | 52 28 + 24 - 0 !
3 files changed, 40 insertions(+), 55 deletions(-)

 replace static init system detection by runtime detection. modified
  version of the patch proposed by Kefu Chai upstream.

doc/cephfs/client-config-ref.rst | 2 1 + 1 - 0 !
src/common/config_opts.h | 2 1 + 1 - 0 !
2 files changed, 2 insertions(+), 2 deletions(-)

---

src/common/Cycles.cc | 4 4 + 0 - 0 !
1 file changed, 4 insertions(+)

 enable high precision clock for ppc + fallback
 This code is only used for benchmarking so warning and
 fallback if architecture does not have support.

src/Makefile.am | 2 0 + 2 - 0 !
1 file changed, 2 deletions(-)

 skip makefile base install of python modules
 ceph-disk and ceph-detect-init are python modules; the Makefile
 based build uses tox and virtualenv, which we really don't want
 to use in the package build process.
 .
 Skip this part of the build, and use d/rules to install.

src/rocksdb/util/concurrent_arena.cc | 25 7 + 18 - 0 !
src/rocksdb/util/concurrent_arena.h | 25 12 + 13 - 0 !
src/rocksdb/util/core_local.h | 84 84 + 0 - 0 !
3 files changed, 103 insertions(+), 31 deletions(-)

 [patch 1/3] corelocalarray class

Summary:
Moved the logic for core-local array out of ConcurrentArena and into a separate class because I want to reuse it for core-local stats.
Closes https://github.com/facebook/rocksdb/pull/2256

src/rocksdb/util/core_local.h | 12 6 + 6 - 0 !
1 file changed, 6 insertions(+), 6 deletions(-)

 [patch 2/3] core-local array type conversions

Summary:
try to clean up the type conversions and hope it passes on windows.

one interesting thing I learned is that bitshift operations are special: in `x << y`, the result type depends only on the type of `x`, unlike most arithmetic operations where the result type depends on both operands' types.
Closes https://github.com/facebook/rocksdb/pull/2277

src/rocksdb/HISTORY.md | 4 4 + 0 - 0 !
src/rocksdb/monitoring/statistics.cc | 129 34 + 95 - 0 !
src/rocksdb/monitoring/statistics.h | 111 29 + 82 - 0 !
src/rocksdb/util/core_local.h | 21 11 + 10 - 0 !
4 files changed, 78 insertions(+), 187 deletions(-)

 [patch 3/3] core-local statistics

Summary: