You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by mu...@apache.org on 2014/08/25 20:51:34 UTC
[1/2] git commit: PHOENIX-1183 phoenix-pig does not work with CDH 5.1
Repository: phoenix
Updated Branches:
refs/heads/4.0 e32676da7 -> 4028255b7
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/59ebcbde
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/59ebcbde
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/59ebcbde
Branch: refs/heads/4.0
Commit: 59ebcbde38c8df2d1ba92cc19d69c824cf01cfb2
Parents: 98b0297
Author: Mujtaba <mu...@apache.org>
Authored: Mon Aug 25 11:50:19 2014 -0700
Committer: Mujtaba <mu...@apache.org>
Committed: Mon Aug 25 11:50:19 2014 -0700
----------------------------------------------------------------------
CHANGES | 2 ++
dev/make_rc.sh | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/59ebcbde/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 316ef78..122d7d5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -139,6 +139,8 @@ Release Notes - Phoenix - Version 4.1
* [PHOENIX-1181] - client cache fails to update itself after a table was altered from a diff client
* [PHOENIX-1187] - Enable tracing on server
* [PHOENIX-1188] - Performance regression for non-aggregate queries
+ * [PHOENIX-1183] - phoenix-pig does not work with CDH 5.1
+ * [PHOENIX-1184] - Phoenix 4.0 will not compile agaist CDH HBase 5.1
* [PHOENIX-1192] - Re-enable reverse scan to prevent order by
** Task
http://git-wip-us.apache.org/repos/asf/phoenix/blob/59ebcbde/dev/make_rc.sh
----------------------------------------------------------------------
diff --git a/dev/make_rc.sh b/dev/make_rc.sh
index e6f9cbd..3e087f6 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;
@@ -95,6 +91,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;
[2/2] git commit: Merge branch '4.0' of
https://git-wip-us.apache.org/repos/asf/phoenix into 4.0
Posted by mu...@apache.org.
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 <mu...@apache.org>
Authored: Mon Aug 25 11:51:03 2014 -0700
Committer: Mujtaba <mu...@apache.org>
Committed: Mon Aug 25 11:51:03 2014 -0700
----------------------------------------------------------------------
.../apache/phoenix/query/ConnectionlessQueryServicesImpl.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------