[2/2] git commit: Merge branch '3.0' of https://git-wip-us.apache.org/repos/asf/phoenix into 3.0

2014-09-21 Thread jamestaylor
Merge branch '3.0' of https://git-wip-us.apache.org/repos/asf/phoenix into 3.0 Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d8766cf7 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d8766cf7 Diff: http://git-wi

[2/2] git commit: Merge branch '3.0' of https://git-wip-us.apache.org/repos/asf/phoenix into 3.0

2014-07-30 Thread jamestaylor
Merge branch '3.0' of https://git-wip-us.apache.org/repos/asf/phoenix into 3.0 Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/9eb935cd Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/9eb935cd Diff: http://git-wi