Steve, This is blocking other commits. Can we revert SENTRY-2208 ( b97f5c7aa89d3c9061dd1b6655fc0702caa93f1f) but hold on committing again till Friday. Huge patches like this are making github and apache repositories out of sync for a couple of days, blocking every one submitting patches.
*Thanks,Kalyan Kumar Kalvagadda* | Software Engineer t. (469) 279- <0000000000>5732 cloudera.com <https://www.cloudera.com> [image: Cloudera] <https://www.cloudera.com/> [image: Cloudera on Twitter] <https://twitter.com/cloudera> [image: Cloudera on Facebook] <https://www.facebook.com/cloudera> [image: Cloudera on LinkedIn] <https://www.linkedin.com/company/cloudera> ------------------------------ On Wed, May 30, 2018 at 6:12 PM, Stephen Moist <[email protected]> wrote: > Heyo, I’m running into a build issue with the latest commit of SENTRY-2208 > (b97f5c7aa89d3c9061dd1b6655fc0702caa93f1f). It looks like the keystore > file for the tests didn’t merge cleanly? When running the tests in > sentry-service-server TestSentryWebServerWithSSL it fails to setup > correctly. Looking at the server log for it on startup, it’s failing > trying to load the keystore. I’ve reverted the commit and did a > dev-support/smart-apply-patch.sh on the last diff and the test passed > this time. I don’t believe it to be an issue with the code changes, just > something with git apply. I’d recommend reverting it and re-applying it > with smart-apply-patch.sh. If that doesn’t fix it, generate a new diff > with —binary. That’s usually fixed the issue in binary files for me.
