[
https://issues.apache.org/jira/browse/HUDI-399?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16993474#comment-16993474
]
vinoyang commented on HUDI-399:
-------------------------------
[~vinoth] [~nishith29] FYI. Will try to fix these conflicts.
> Fix conflicts of test suite basic implementation based on master branch
> -----------------------------------------------------------------------
>
> Key: HUDI-399
> URL: https://issues.apache.org/jira/browse/HUDI-399
> Project: Apache Hudi (incubating)
> Issue Type: Sub-task
> Components: Testing
> Reporter: vinoyang
> Priority: Major
>
> There are many conflicts when rebasing on master branch, we need to fix those
> conflicts:
>
> {code:java}
> hudi-client/src/test/java/org/apache/hudi/common/HoodieTestDataGenerator.javahudi-hive/src/main/java/org/apache/hudi/hive/HoodieHiveClient.javahudi-hive/src/test/java/org/apache/hudi/hive/util/HiveTestService.javahudi-spark/src/main/java/org/apache/hudi/ComplexKeyGenerator.javahudi-spark/src/main/java/org/apache/hudi/EmptyHoodieRecordPayload.javahudi-spark/src/main/java/org/apache/hudi/KeyGenerator.javahudi-spark/src/main/java/org/apache/hudi/NonpartitionedKeyGenerator.javahudi-spark/src/main/java/org/apache/hudi/SimpleKeyGenerator.javahudi-utilities/src/main/java/org/apache/hudi/utilities/UtilHelpers.javahudi-utilities/src/main/java/org/apache/hudi/utilities/deltastreamer/HoodieDeltaStreamer.javahudi-utilities/src/main/java/org/apache/hudi/utilities/deltastreamer/HoodieDeltaStreamerMetrics.javahudi-utilities/src/main/java/org/apache/hudi/utilities/keygen/TimestampBasedKeyGenerator.javahudi-utilities/src/main/java/org/apache/hudi/utilities/sources/AvroDFSSource.java
> {code}
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
