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/1b92c32b Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/1b92c32b Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/1b92c32b Branch: refs/heads/txn Commit: 1b92c32b56a042d7e8f00ceaccd013df67a5093d Parents: 0d02b96 f31ece1 Author: Thomas D'Silva <[email protected]> Authored: Wed Nov 18 17:37:06 2015 -0800 Committer: Thomas D'Silva <[email protected]> Committed: Wed Nov 18 17:37:06 2015 -0800 ---------------------------------------------------------------------- .../org/apache/phoenix/jdbc/PhoenixDriver.java | 41 ++++---------------- 1 file changed, 7 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/1b92c32b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java ----------------------------------------------------------------------
