[6/9] phoenix git commit: PHOENIX-1446 Add/fix logging for LIMIT optimization

2014-11-12 Thread jamestaylor
PHOENIX-1446 Add/fix logging for LIMIT optimization Conflicts: phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixStatement.java

[6/9] phoenix git commit: PHOENIX-1446 Add/fix logging for LIMIT optimization

2014-11-12 Thread jamestaylor
PHOENIX-1446 Add/fix logging for LIMIT optimization Conflicts: phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixStatement.java