Merge branch '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/6da318b8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6da318b8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6da318b8 Branch: refs/heads/master Commit: 6da318b8a964f8e9bea582c2621329bb338aa861 Parents: a1eb475 a95831a Author: Eric Newton <[email protected]> Authored: Thu Jan 2 12:03:58 2014 -0500 Committer: Eric Newton <[email protected]> Committed: Thu Jan 2 12:03:58 2014 -0500 ---------------------------------------------------------------------- proxy/examples/python/TestClient.py | 4 ++-- proxy/examples/ruby/test_client.rb | 8 ++++---- .../org/apache/accumulo/proxy/ProxyServer.java | 6 ++---- .../org/apache/accumulo/proxy/thrift/Key.java | 6 ++++-- proxy/src/main/thrift/proxy.thrift | 4 +++- .../apache/accumulo/proxy/SimpleProxyIT.java | 20 +++++++++++++++++++ test/src/test/resources/TestCombinerY.jar | Bin 4335 -> 4129 bytes 7 files changed, 35 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
