[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: http://git-wip-us.apache.org/repos/asf/phoenix/diff/1110aedd

Branch: refs/heads/4.0
Commit: 1110aeddf896248961e43f99e5ee2190929b7145
Parents: a66271d 94f637f
Author: James Taylor jtay...@salesforce.com
Authored: Wed Sep 24 18:45:50 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Wed Sep 24 18:45:50 2014 -0700

--
 bin/hadoop-metrics2-hbase.properties|  20 ++
 bin/hadoop-metrics2-phoenix.properties  |  53 +++
 phoenix-assembly/pom.xml|   4 +-
 phoenix-assembly/src/build/hadoop-one-all.xml   |  53 ---
 phoenix-assembly/src/build/hadoop-two-all.xml   |  64 
 .../src/build/package-to-tar-all.xml|  38 +++
 phoenix-core/pom.xml| 280 +---
 .../org/apache/phoenix/end2end/ArrayIT.java | 101 +++---
 .../phoenix/coprocessor/ScanRegionObserver.java |  62 ++--
 .../phoenix/filter/ColumnProjectionFilter.java  |  21 +-
 phoenix-flume/pom.xml   | 276 +---
 phoenix-hadoop1-compat/pom.xml  |  40 ---
 .../bin/hadoop-metrics2-hbase.properties|  20 --
 .../bin/hadoop-metrics2-phoenix.properties  |  53 ---
 phoenix-pig/pom.xml | 292 +---
 pom.xml | 329 ++-
 16 files changed, 568 insertions(+), 1138 deletions(-)
--

[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: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4028255b

Branch: refs/heads/4.0
Commit: 4028255b73abc41a23ae380a7f91ad8db07900e9
Parents: 59ebcbd e32676d
Author: Mujtaba mujt...@apache.org
Authored: Mon Aug 25 11:51:03 2014 -0700
Committer: Mujtaba mujt...@apache.org
Committed: Mon Aug 25 11:51:03 2014 -0700

--
 .../apache/phoenix/query/ConnectionlessQueryServicesImpl.java   | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--