00f50cce0785d20115c32f8106f31e41476f3bd3 - accumulo-proxy - Git at Google

commit: 00f50cce0785d20115c32f8106f31e41476f3bd3
[log]
author: Josh Elser <elserj@apache.org>
Wed May 27 16:45:46 2015 -0400
committer: Josh Elser <elserj@apache.org>
Wed May 27 16:45:46 2015 -0400
tree: b6730191ad7c03b357f0cf869672ba2e4913bb0b
parent: 258e007b577933965fbe169087325cc43b098dae [diff]
parent: 57e57cf176acd41b88d495a82e3b1001c8e0909e [diff]

Merge branch '1.6' into 1.7

Conflicts:
	proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java

tree: b6730191ad7c03b357f0cf869672ba2e4913bb0b