search

comeara / pillar

Pillar manages migrations for your Cassandra data stores.
https://github.com/comeara/pillar
MIT License
111 stars 64 forks source link

Fix deduplicate error during merge #32

Closed ilovezfs closed 8 years ago

ilovezfs commented 8 years ago

The following files have the same path but slightly different content (the timestamp at the top and the buildDate):

netty-buffer-4.0.33.Final.jar:META-INF/io.netty.versions.properties netty-codec-4.0.33.Final.jar:META-INF/io.netty.versions.properties netty-common-4.0.33.Final.jar:META-INF/io.netty.versions.properties netty-handler-4.0.33.Final.jar:META-INF/io.netty.versions.properties netty-transport-4.0.33.Final.jar:META-INF/io.netty.versions.properties

Using MergeStrategy.last for the common path prevents a deduplicate error during sbt assembly.

ilovezfs commented 8 years ago

This fixes a regression in the v2.1.0 release.

comeara commented 8 years ago

Thanks for the fix! I picked up your change on the v2.1-maintenance branch and released 2.1.1.

ilovezfs commented 8 years ago

Excellent, thank you. Will there be a new tag?

comeara commented 8 years ago

Yes, v2.1.1.

Thank you, also for maintaining the Homebrew integration.

ilovezfs commented 8 years ago

@comeara You're welcome. Thanks for the tag! We do everything by tag so that will let me remove the patching from the formula :)