Merge branch '4.0' of https://git-wip-us.apache.org/repos/asf/phoenix into 4.0
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/7b571608 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7b571608 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7b571608 Branch: refs/heads/4.2 Commit: 7b5716084be1a462b2ca093c512b7a24476c3e5b Parents: 351769c 00522cf Author: James Taylor <[email protected]> Authored: Sun Oct 26 22:38:06 2014 -0700 Committer: James Taylor <[email protected]> Committed: Sun Oct 26 22:38:06 2014 -0700 ---------------------------------------------------------------------- bin/phoenix_utils.py | 2 +- .../main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
