phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamestay...@apache.org
Subject [08/15] git commit: PHOENIX-1382: Phoenix 4.2 RC Issue
Date Wed, 29 Oct 2014 00:02:03 GMT
PHOENIX-1382: Phoenix 4.2 RC Issue


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

Branch: refs/heads/3.2
Commit: ca6c08f044626386c6a988906617dfc71310d390
Parents: 0d90e2f
Author: Jeffrey Zhong <jeffreyz@apache.org>
Authored: Sun Oct 26 22:07:13 2014 -0700
Committer: Jeffrey Zhong <jeffreyz@apache.org>
Committed: Sun Oct 26 22:17:16 2014 -0700

----------------------------------------------------------------------
 bin/phoenix_utils.py                                               | 2 +-
 .../main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ca6c08f0/bin/phoenix_utils.py
----------------------------------------------------------------------
diff --git a/bin/phoenix_utils.py b/bin/phoenix_utils.py
index 4f7d9c3..2331ae9 100755
--- a/bin/phoenix_utils.py
+++ b/bin/phoenix_utils.py
@@ -49,7 +49,7 @@ def findFileInPathWithoutRecursion(pattern, path):
     return ""
 
 def setPath():
- PHOENIX_CLIENT_JAR_PATTERN = "phoenix-*-client*.jar"
+ PHOENIX_CLIENT_JAR_PATTERN = "phoenix-*-client.jar"
  PHOENIX_TESTS_JAR_PATTERN = "phoenix-*-tests*.jar"
  global current_dir
  current_dir = os.path.dirname(os.path.abspath(__file__))

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ca6c08f0/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
index 3944d9e..7979757 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
@@ -56,7 +56,7 @@ import com.google.common.collect.Lists;
  */
 public interface MetaDataProtocol extends CoprocessorProtocol {
     public static final int PHOENIX_MAJOR_VERSION = 3;
-    public static final int PHOENIX_MINOR_VERSION = 1;
+    public static final int PHOENIX_MINOR_VERSION = 2;
     public static final int PHOENIX_PATCH_NUMBER = 0;
     public static final int PHOENIX_VERSION = 
             VersionUtil.encodeVersion(PHOENIX_MAJOR_VERSION, PHOENIX_MINOR_VERSION, PHOENIX_PATCH_NUMBER);


Mime
View raw message