[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(-)
--

git commit: PHOENIX-1183 phoenix-pig does not work with CDH 5.1

2014-08-25 Thread mujtaba 
Repository: phoenix
Updated Branches:
  refs/heads/3.0 e010a979d - ca86a4763


PHOENIX-1183 phoenix-pig does not work with CDH 5.1


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ca86a476
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ca86a476
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ca86a476

Branch: refs/heads/3.0
Commit: ca86a4763a871e58bf189f00d234116cd97e5d7e
Parents: e010a97
Author: Mujtaba mujt...@apache.org
Authored: Mon Aug 25 11:53:50 2014 -0700
Committer: Mujtaba mujt...@apache.org
Committed: Mon Aug 25 11:53:50 2014 -0700

--
 CHANGES| 1 +
 dev/make_rc.sh | 8 
 2 files changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ca86a476/CHANGES
--
diff --git a/CHANGES b/CHANGES
index ddf79e5..14bceaa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -114,6 +114,7 @@ Release Notes - Phoenix - Version 3.1
 * [PHOENIX-1172] - Prevent lock contention in ConnectionQueryServicesImpl. 
Fix exception handling. 
 * [PHOENIX-1180] - Rename test classes so they are properly picked up by 
the test runner
 * [PHOENIX-1181] - client cache fails to update itself after a table was 
altered from a diff client
+* [PHOENIX-1183] - phoenix-pig does not work with CDH 5.1
 * [PHOENIX-1188] - Performance regression for non-aggregate queries
 
 ** Task

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ca86a476/dev/make_rc.sh
--
diff --git a/dev/make_rc.sh b/dev/make_rc.sh
index ffcdb48..6087a8b 100755
--- a/dev/make_rc.sh
+++ b/dev/make_rc.sh
@@ -74,10 +74,6 @@ rm -rf $(find . -type d -name archive-tmp);
 cp $(find -iname phoenix-$PHOENIX-client-minimal.jar) $DIR_COMMON;
 cp $(find -iname phoenix-$PHOENIX-client-without-hbase.jar) $DIR_COMMON;
 cp $(find -iname phoenix-core-$PHOENIX.jar) $DIR_COMMON;
-cp $(find -iname phoenix-flume-$PHOENIX.jar) $DIR_COMMON;
-cp $(find -iname phoenix-flume-$PHOENIX-tests.jar) $DIR_COMMON;
-cp $(find -iname phoenix-pig-$PHOENIX.jar) $DIR_COMMON;
-cp $(find -iname phoenix-pig-$PHOENIX-tests.jar) $DIR_COMMON;
 
 # Copy release docs
 cp CHANGES $DIR_REL_BIN_PATH;
@@ -94,6 +90,10 @@ function_copy_hadoop_specific_jars() {
   cp $DIR_BIN/* $DIR_HADOOP$1/$DIR_BIN;
   cp $(find -iname phoenix-$PHOENIX-client.jar) 
$DIR_HADOOP$1/phoenix-$PHOENIX-client-hadoop$1.jar;
   cp $(find -iname phoenix-core-$PHOENIX-tests.jar) 
$DIR_HADOOP$1/phoenix-core-$PHOENIX-tests-hadoop$1.jar;
+  cp $(find -iname phoenix-flume-$PHOENIX.jar) 
$DIR_HADOOP$1/phoenix-flume-$PHOENIX-hadoop$1.jar;
+  cp $(find -iname phoenix-flume-$PHOENIX-tests.jar) 
$DIR_HADOOP$1/phoenix-flume-$PHOENIX-tests-hadoop$1.jar;
+  cp $(find -iname phoenix-pig-$PHOENIX.jar) 
$DIR_HADOOP$1/phoenix-pig-$PHOENIX-hadoop$1.jar;
+  cp $(find -iname phoenix-pig-$PHOENIX-tests.jar) 
$DIR_HADOOP$1/phoenix-pig-$PHOENIX-tests-hadoop$1.jar;
 }
 function_copy_hadoop_specific_jars 1;
 mvn clean package -Dhadoop.profile=2 -DskipTests;

git commit: PHOENIX-1183 phoenix-pig does not work with CDH 5.1

2014-08-25 Thread mujtaba 
Repository: phoenix
Updated Branches:
  refs/heads/master 8cc38126b - 0e42f3a1f


PHOENIX-1183 phoenix-pig does not work with CDH 5.1


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/0e42f3a1
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/0e42f3a1
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/0e42f3a1

Branch: refs/heads/master
Commit: 0e42f3a1fd08013b4fe4d26409a16113e8624bf0
Parents: 8cc3812
Author: Mujtaba mujt...@apache.org
Authored: Mon Aug 25 11:55:59 2014 -0700
Committer: Mujtaba mujt...@apache.org
Committed: Mon Aug 25 11:55:59 2014 -0700

--
 dev/make_rc.sh | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/0e42f3a1/dev/make_rc.sh
--
diff --git a/dev/make_rc.sh b/dev/make_rc.sh
index d119e35..6755cf8 100755
--- a/dev/make_rc.sh
+++ b/dev/make_rc.sh
@@ -74,10 +74,6 @@ rm -rf $(find . -type d -name archive-tmp);
 cp $(find -iname phoenix-$PHOENIX-client-minimal.jar) $DIR_COMMON;
 cp $(find -iname phoenix-$PHOENIX-client-without-hbase.jar) $DIR_COMMON;
 cp $(find -iname phoenix-core-$PHOENIX.jar) $DIR_COMMON;
-cp $(find -iname phoenix-flume-$PHOENIX.jar) $DIR_COMMON;
-cp $(find -iname phoenix-flume-$PHOENIX-tests.jar) $DIR_COMMON;
-cp $(find -iname phoenix-pig-$PHOENIX.jar) $DIR_COMMON;
-cp $(find -iname phoenix-pig-$PHOENIX-tests.jar) $DIR_COMMON;
 
 # Copy release docs
 function_copy() {
@@ -105,6 +101,10 @@ function_copy_hadoop_specific_jars() {
   cp $(find -iname phoenix-$PHOENIX-client.jar) 
$DIR_HADOOP$1/phoenix-$PHOENIX-client-hadoop$1.jar;
   cp $(find -iname phoenix-$PHOENIX-server.jar) 
$DIR_HADOOP$1/phoenix-$PHOENIX-server-hadoop$1.jar;
   cp $(find -iname phoenix-core-$PHOENIX-tests.jar) 
$DIR_HADOOP$1/phoenix-core-$PHOENIX-tests-hadoop$1.jar;
+  cp $(find -iname phoenix-flume-$PHOENIX.jar) 
$DIR_HADOOP$1/phoenix-flume-$PHOENIX-hadoop$1.jar;
+  cp $(find -iname phoenix-flume-$PHOENIX-tests.jar) 
$DIR_HADOOP$1/phoenix-flume-$PHOENIX-tests-hadoop$1.jar;
+  cp $(find -iname phoenix-pig-$PHOENIX.jar) 
$DIR_HADOOP$1/phoenix-pig-$PHOENIX-hadoop$1.jar;
+  cp $(find -iname phoenix-pig-$PHOENIX-tests.jar) 
$DIR_HADOOP$1/phoenix-pig-$PHOENIX-tests-hadoop$1.jar;
 }
 function_copy_hadoop_specific_jars 1;
 mvn clean package -Dhadoop.profile=2 -DskipTests;

Apache-Phoenix | Master | Hadoop1 | Build Successful

2014-08-25 Thread Apache Jenkins Server 
Master branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git

Last Successful Compiled Artifacts https://builds.apache.org/job/Phoenix-master-hadoop1/lastSuccessfulBuild/artifact/

Last Complete Test Report https://builds.apache.org/job/Phoenix-master-hadoop1/lastCompletedBuild/testReport/

Changes
[jtaylor] PHOENIX-1184 Phoenix 4.0 will not compile agaist CDH HBase 5.1

Apache-Phoenix | 4.0 | Hadoop1 | Build Successful

2014-08-25 Thread Apache Jenkins Server 
4.0 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.0-hadoop1/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.0-hadoop1/lastCompletedBuild/testReport/

Changes
[mujtaba] PHOENIX-1183 phoenix-pig does not work with CDH 5.1