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/3f254dc4 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/3f254dc4 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/3f254dc4 Branch: refs/heads/3.0 Commit: 3f254dc4d46ec3615d30a57c24b5ccc4a5dbe745 Parents: e33c99d 81c300c Author: James Taylor <jtay...@salesforce.com> Authored: Fri Oct 17 00:53:54 2014 -0700 Committer: James Taylor <jtay...@salesforce.com> Committed: Fri Oct 17 00:53:54 2014 -0700 ---------------------------------------------------------------------- .../ConnectionQueryServicesTestImpl.java | 2 +- .../org/apache/phoenix/jdbc/PhoenixDriver.java | 2 +- .../phoenix/mapreduce/CsvBulkLoadTool.java | 7 ++++++- .../phoenix/mapreduce/CsvToKeyValueMapper.java | 21 +++++++++++++++++++- .../query/ConnectionQueryServicesImpl.java | 9 ++++++++- 5 files changed, 36 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/3f254dc4/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java ----------------------------------------------------------------------
