arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject arrow git commit: ARROW-704: Fix bad import caused by conflicting changes
Date Thu, 23 Mar 2017 16:18:40 GMT
Repository: arrow
Updated Branches:
  refs/heads/master e8f6a492d -> 7594492d5


ARROW-704: Fix bad import caused by conflicting changes

Author: Julien Le Dem <julien@dremio.com>

Closes #430 from julienledem/ARROW-704 and squashes the following commits:

2e42330 [Julien Le Dem] ARROW-704: Fix bad import caused by conflicting changes


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

Branch: refs/heads/master
Commit: 7594492d5105e86d3388c8bac94dab8dbfa5226a
Parents: e8f6a49
Author: Julien Le Dem <julien@dremio.com>
Authored: Thu Mar 23 17:18:35 2017 +0100
Committer: Uwe L. Korn <uwelk@xhochy.com>
Committed: Thu Mar 23 17:18:35 2017 +0100

----------------------------------------------------------------------
 .../test/java/org/apache/arrow/vector/types/pojo/TestSchema.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/7594492d/java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestSchema.java
----------------------------------------------------------------------
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestSchema.java
b/java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestSchema.java
index 9f1b2e0..57af952 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestSchema.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestSchema.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
-import java.util.List;
 
 import org.apache.arrow.vector.types.FloatingPointPrecision;
 import org.apache.arrow.vector.types.IntervalUnit;
@@ -152,7 +151,7 @@ public class TestSchema {
     assertEquals(schema.hashCode(), actual.hashCode());
   }
 
-  private void validateFieldsHashcode(List<Field> schemaFields, List<Field> actualFields)
{
+  private void validateFieldsHashcode(java.util.List<Field> schemaFields, java.util.List<Field>
actualFields) {
     assertEquals(schemaFields.size(), actualFields.size());
     if (schemaFields.size() == 0) {
       return;


Mime
View raw message