Skip to content
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master' into SPARK-27402
# Conflicts:
#	pom.xml
  • Loading branch information
wangyum committed Apr 19, 2019
commit 24598ee0130ff3259a29758c0c825f8be577958e
5 changes: 3 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2819,8 +2819,9 @@
<hive.classifier>core</hive.classifier>
<hive.version>${hive23.version}</hive.version>
<hive.version.short>2.3.4</hive.version.short>
<hive.parquet.group>org.apache.parquet</hive.parquet.group>
<hive.parquet.version>${parquet.version}</hive.parquet.version>
<!-- Do not need parquet-hadoop-bundle because we already have
parquet-common, parquet-column and parquet-hadoop -->
<hive.parquet.scope>provided</hive.parquet.scope>
<orc.classifier></orc.classifier>
<datanucleus-core.version>4.1.17</datanucleus-core.version>
</properties>
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.