[2/3] git commit: ACCUMULO-2950 Add an RpcWrapper class

2014-06-25 Thread ctubbsii
ACCUMULO-2950 Add an RpcWrapper class Adds an RpcWrapper class to reintroduce the previous behavior in Thrift 0.9.0 that was broken by THRIFT-1805 in Thrift 0.9.1. This is done by extending the InvocationHandler that was already being used to incorporate Trace information into the RPC call

[1/3] git commit: ACCUMULO-2950 Add an RpcWrapper class

2014-06-25 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 0a0bdd999 -> 8bc8d4e4f refs/heads/master 35f618eee -> 4f139138a ACCUMULO-2950 Add an RpcWrapper class Adds an RpcWrapper class to reintroduce the previous behavior in Thrift 0.9.0 that was broken by THRIFT-1805 in Thrift 0.

[3/3] git commit: Merge branch '1.6.1-SNAPSHOT'

2014-06-25 Thread ctubbsii
Merge branch '1.6.1-SNAPSHOT' Merging ACCUMULO-2950, and applying changes to replication services. Conflicts: server/base/pom.xml server/master/src/main/java/org/apache/accumulo/master/Master.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-w

[3/3] git commit: Merge branch '1.6.1-SNAPSHOT'

2014-06-25 Thread mdrob
Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/35f618ee Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/35f618ee Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/35f618

[1/3] git commit: ACCUMULO-2908 use batch scanner opts when parsing

2014-06-25 Thread mdrob
Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT cfda8fab6 -> 0a0bdd999 refs/heads/master 590b2cf25 -> 35f618eee ACCUMULO-2908 use batch scanner opts when parsing Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/acc

[2/3] git commit: ACCUMULO-2908 use batch scanner opts when parsing

2014-06-25 Thread mdrob
ACCUMULO-2908 use batch scanner opts when parsing Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0a0bdd99 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0a0bdd99 Diff: http://git-wip-us.apache.org/repos/asf/