GitHub user ssisk opened a pull request: https://github.com/apache/beam/pull/2492
Fix build breaks caused by overlaps between b615013 and c08b7b1 Be sure to do all of the following to help us incorporate your contribution quickly and easily: - [] Make sure the PR title is formatted like: `[BEAM-<Jira issue #>] Description of pull request` - [X] Make sure tests pass via `mvn clean verify`. (Even better, enable Travis-CI on your fork and ensure the whole test matrix passes). - [] Replace `<Jira issue #>` in the title with the actual Jira issue number, if there is one. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). --- There were conflicting changes in the cassandra unit tests & hashingfn changes You can merge this pull request into a Git repository by running: $ git pull https://github.com/ssisk/beam fix-cassandra-hash Alternatively you can review and apply these changes as the patch at: https://github.com/apache/beam/pull/2492.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #2492 ---- commit ccae1267442a9d8b176a531aa886437d5ad5c9ca Author: Stephen Sisk <s...@google.com> Date: 2017-04-11T18:07:48Z Fix build breaks caused by overlaps between b615013 and c08b7b1 ---- --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---