Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/49b8ffed Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/49b8ffed Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/49b8ffed Branch: refs/heads/1.6.0-SNAPSHOT Commit: 49b8ffed92e2611e12a2d80896ca6da5d617842e Parents: 26c51db 3d436e7 Author: John Vines <vi...@apache.org> Authored: Tue Feb 4 17:13:08 2014 -0500 Committer: John Vines <vi...@apache.org> Committed: Tue Feb 4 17:13:08 2014 -0500 ---------------------------------------------------------------------- core/src/main/scripts/generate-thrift.sh | 121 +- proxy/src/main/cpp/AccumuloProxy.cpp | 26408 +++++++++++++++++ proxy/src/main/cpp/AccumuloProxy.h | 11664 ++++++++ .../main/cpp/AccumuloProxy_server.skeleton.cpp | 415 + proxy/src/main/cpp/proxy_constants.cpp | 33 + proxy/src/main/cpp/proxy_constants.h | 40 + proxy/src/main/cpp/proxy_types.cpp | 2586 ++ proxy/src/main/cpp/proxy_types.h | 1600 + proxy/src/main/python/AccumuloProxy-remote | 599 + proxy/src/main/python/AccumuloProxy.py | 16796 +++++++++++ proxy/src/main/python/__init__.py | 15 + proxy/src/main/python/constants.py | 25 + proxy/src/main/python/ttypes.py | 2391 ++ proxy/src/main/ruby/accumulo_proxy.rb | 5072 ++++ proxy/src/main/ruby/proxy_constants.rb | 25 + proxy/src/main/ruby/proxy_types.rb | 650 + proxy/src/main/scripts/generate-thrift.sh | 1 + 17 files changed, 68413 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
