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

2014-09-24 Thread jamestaylor
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/1110aedd Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/1110aedd Diff:

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

2014-08-25 Thread mujtaba
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/4028255b Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4028255b Diff: