Merge branch 'master' into txn
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/cd0632ff Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/cd0632ff Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/cd0632ff Branch: refs/heads/txn Commit: cd0632ffc010bb2ab99123c6126edd03e754cde4 Parents: 7d3b544 c26cce5 Author: Thomas D'Silva <[email protected]> Authored: Wed Nov 4 11:32:04 2015 -0800 Committer: Thomas D'Silva <[email protected]> Committed: Wed Nov 4 11:32:04 2015 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/phoenix/mapreduce/CsvBulkLoadTool.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
