You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@pig.apache.org by da...@apache.org on 2013/06/25 00:26:47 UTC

svn commit: r1496241 - in /pig/trunk: CHANGES.txt test/org/apache/pig/test/Util.java

Author: daijy
Date: Mon Jun 24 22:26:46 2013
New Revision: 1496241

URL: http://svn.apache.org/r1496241
Log:
PIG-3361: Improve Hadoop version detection logic for Pig unit test

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/test/org/apache/pig/test/Util.java

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1496241&r1=1496240&r2=1496241&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Mon Jun 24 22:26:46 2013
@@ -28,6 +28,8 @@ PIG-3174:  Remove rpm and deb artifacts 
 
 IMPROVEMENTS
 
+PIG-3361: Improve Hadoop version detection logic for Pig unit test (daijy)
+
 PIG-3280: Document IN operator and CASE expression (cheolsoo)
 
 PIG-3342: Allow conditions in case statement (cheolsoo)

Modified: pig/trunk/test/org/apache/pig/test/Util.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/Util.java?rev=1496241&r1=1496240&r2=1496241&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/Util.java (original)
+++ pig/trunk/test/org/apache/pig/test/Util.java Mon Jun 24 22:26:46 2013
@@ -1223,7 +1223,7 @@ public class Util {
 
     public static boolean isHadoop2_0() {
         String version = org.apache.hadoop.util.VersionInfo.getVersion();
-        if (version.matches("\\b2\\.0\\..+"))
+        if (version.matches("\\b2\\.\\d\\..+"))
             return true;
         return false;
     }