Skip to content

Conversation

@rdblue
Copy link
Contributor

@rdblue rdblue commented May 26, 2020

This fixes #935. The purpose of this PR is to merge master into that branch and merge, because there are so many commit conflicts with the import changes.

Co-authored-by: awoodhead [email protected]
Co-authored-by: cmathiesen [email protected]

massdosage and others added 21 commits April 17, 2020 17:08
# Conflicts:
#	api/src/main/java/org/apache/iceberg/events/Listeners.java
* Swap to shaded guava in common and core modules
* Shade in arrow module
…diaGroup/incubator-iceberg.git into relocated-external-dependencies
# Conflicts:
#	api/src/main/java/org/apache/iceberg/Filterable.java
#	api/src/main/java/org/apache/iceberg/types/TypeUtil.java
#	core/src/main/java/org/apache/iceberg/FilteredManifest.java
#	core/src/main/java/org/apache/iceberg/ManifestReader.java
#	core/src/main/java/org/apache/iceberg/SchemaUpdate.java
#	core/src/main/java/org/apache/iceberg/avro/AvroIterable.java
#	core/src/main/java/org/apache/iceberg/hadoop/HadoopTableOperations.java
#	core/src/main/java/org/apache/iceberg/util/ParallelIterable.java
#	data/src/main/java/org/apache/iceberg/data/parquet/GenericParquetWriter.java
#	mr/src/main/java/org/apache/iceberg/mr/mapreduce/IcebergInputFormat.java
#	parquet/src/main/java/org/apache/iceberg/parquet/MessageTypeToType.java
#	spark/src/main/java/org/apache/iceberg/spark/data/SparkAvroWriter.java
#	spark/src/main/java/org/apache/iceberg/spark/data/SparkParquetWriters.java
#	spark/src/main/java/org/apache/iceberg/spark/source/BaseDataReader.java
#	spark/src/main/java/org/apache/iceberg/spark/source/RowDataReader.java
#	spark/src/test/java/org/apache/iceberg/TestDataFileSerialization.java
Merge master, tidy up, fix shadow jar publishing
@rdblue rdblue merged commit c28d1c8 into apache:master May 26, 2020
@rdblue
Copy link
Contributor Author

rdblue commented May 26, 2020

I tested this locally, so I didn't wait for CI to complete.

waterlx added a commit to waterlx/incubator-iceberg that referenced this pull request May 28, 2020
waterlx added a commit to waterlx/incubator-iceberg that referenced this pull request May 28, 2020
@dongjoon-hyun
Copy link
Member

cc @dbtsai

waterlx added a commit to waterlx/incubator-iceberg that referenced this pull request Jun 3, 2020
simonsssu pushed a commit to simonsssu/iceberg that referenced this pull request Aug 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants