http://git-wip-us.apache.org/repos/asf/accumulo/blob/e2247ead/proxy/src/main/python/ttypes.py
--
diff --cc proxy/src/main/python/ttypes.py
index 69269bc,3f9ec9c..ca90543
--- a/proxy/src/main/python/ttypes.py
+++ b/proxy/src/main/py
Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/993683e5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/993683e5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/993683e5
Branch: