You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by dl...@apache.org on 2016/04/12 15:58:56 UTC
[39/39] accumulo git commit: Merge branch 'master' into ACCUMULO-4173
Merge branch 'master' into ACCUMULO-4173
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9bef8b6c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9bef8b6c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9bef8b6c
Branch: refs/heads/ACCUMULO-4173
Commit: 9bef8b6c1ef488dcbd6cdcdca13c087e4b17ecb0
Parents: d745e7c 25b99c2
Author: Dave Marion <dl...@apache.org>
Authored: Tue Apr 12 09:48:21 2016 -0400
Committer: Dave Marion <dl...@apache.org>
Committed: Tue Apr 12 09:48:21 2016 -0400
----------------------------------------------------------------------
.travis.yml | 4 +-
core/src/main/findbugs/exclude-filter.xml | 5 +
.../client/impl/TabletServerBatchWriter.java | 13 +-
.../core/file/blockfile/ABlockReader.java | 2 +
.../file/blockfile/impl/CachableBlockFile.java | 31 +-
.../impl/SeekableByteArrayInputStream.java | 141 +
.../core/file/rfile/MultiLevelIndex.java | 219 +-
proxy/examples/python/TestNamespace.py | 172 +
proxy/src/main/cpp/AccumuloProxy.cpp | 33610 ++++---
proxy/src/main/cpp/AccumuloProxy.h | 5162 +-
.../main/cpp/AccumuloProxy_server.skeleton.cpp | 115 +
proxy/src/main/cpp/proxy_types.cpp | 315 +
proxy/src/main/cpp/proxy_types.h | 166 +
.../org/apache/accumulo/proxy/ProxyServer.java | 289 +
.../accumulo/proxy/thrift/AccumuloProxy.java | 88369 +++++++++++------
.../proxy/thrift/NamespaceExistsException.java | 414 +
.../thrift/NamespaceNotEmptyException.java | 414 +
.../thrift/NamespaceNotFoundException.java | 414 +
.../proxy/thrift/NamespacePermission.java | 82 +
proxy/src/main/python/AccumuloProxy-remote | 161 +
proxy/src/main/python/AccumuloProxy.py | 15767 ++-
proxy/src/main/python/ttypes.py | 239 +
proxy/src/main/ruby/accumulo_proxy.rb | 1740 +-
proxy/src/main/ruby/proxy_types.rb | 83 +
proxy/src/main/thrift/proxy.thrift | 61 +-
.../apache/accumulo/tserver/InMemoryMap.java | 23 +-
.../org/apache/accumulo/tserver/MemKey.java | 10 +-
.../accumulo/tserver/MemKeyComparator.java | 2 +-
.../org/apache/accumulo/tserver/NativeMap.java | 27 +-
.../PartialMutationSkippingIterator.java | 2 +-
test/pom.xml | 22 +
.../org/apache/accumulo/test/InMemoryMapIT.java | 367 +
.../test/functional/SessionBlockVerifyIT.java | 176 +
.../accumulo/test/proxy/SimpleProxyBase.java | 407 +-
.../proxy/TestProxyNamespaceOperations.java | 165 +
.../test/proxy/TestProxySecurityOperations.java | 13 +
.../test/functional/SessionBlockVerifyIT.java | 176 -
37 files changed, 103142 insertions(+), 46236 deletions(-)
----------------------------------------------------------------------