| commit | 3a45fdf48d72cec10d6f8db89fe6f94779294ca1 | [log] [tgz] |
|---|---|---|
| author | Josh Elser <elserj@apache.org> | Tue Dec 01 16:44:01 2015 -0500 |
| committer | Josh Elser <elserj@apache.org> | Tue Dec 01 16:44:01 2015 -0500 |
| tree | cf8189c6b1a502ffc48925cf1a55ec4990ba35bd | |
| parent | 79e2aacf0db2b22faa43c5bd0ccee7778fe46250 [diff] | |
| parent | ba19b275d5fc1b27142fd65d97bdcb769f6add3e [diff] |
Merge branch '1.6' into 1.7 Conflicts: proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java server/base/src/main/java/org/apache/accumulo/server/rpc/RpcWrapper.java server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java server/master/src/main/java/org/apache/accumulo/master/Master.java server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java