The integration test failures, at least for the 1st part, are just flakiness, and not related to the change. The merge conflict is also not as it seems (or at least this is my conjecture). The 1st change here advances the version, and the 2nd puts it to the next snapshot; the second is based on the first. Therefore the second can't be merged without merging the first one. I think the Gerrit UI calls this a merge conflict for whatever reason, in previous versions it would only complain about such things on submit if they were an issue.
I have updated the two changes to be on a branch as well as fixing a minor bug with the Hyracks/Algebricks version in the POM of the snapshot advance change. This way if one is to check out these commits via the tag they will always be the same even after we merge them. These are the updated changes: https://asterix-gerrit.ics.uci.edu/#/c/1663/ https://asterix-gerrit.ics.uci.edu/#/c/1662/ Also, just as a pointer, here is the guide to verifying releases, many thanks to Taewoo for reminding me of its existence: https://cwiki.apache.org/confluence/display/ASTERIXDB/Release+Verification - Ian On Tue, Apr 4, 2017 at 11:40 AM, abdullah alamoudi <[email protected]> wrote: > Ian, > One of them fails integration tests, the other can't be merged and needs to > be rebased. > > Cheers, > Abdullah. > >> On Apr 4, 2017, at 11:16 AM, Ian Maxon <[email protected]> wrote: >> >> Hi everyone, >> >> Please verify and vote on the 2nd release of Apache AsterixDB >> >> The change that produced this release and the change to advance the version >> are >> up for review here: >> >> https://asterix-gerrit.ics.uci.edu/#/c/1660/ >> https://asterix-gerrit.ics.uci.edu/#/c/1661/ >> >> To check out the release, simply fetch the review and check out the >> fetch head like so: >> >> git fetch https://asterix-gerrit.ics.uci.edu:29418/asterixdb >> refs/changes/54/1660/1 && git checkout FETCH_HEAD >> >> The artifacts, sha1's, and signatures are (for each artifact), are at: >> >> AsterixDB Source >> https://dist.apache.org/repos/dist/dev/asterixdb/apache-asterixdb-0.9.1-source-release.zip >> https://dist.apache.org/repos/dist/dev/asterixdb/apache-asterixdb-0.9.1-source-release.zip.asc >> https://dist.apache.org/repos/dist/dev/asterixdb/apache-asterixdb-0.9.1-source-release.zip.sha1 >> >> SHA1: 8fc212b478e1e3ef62865de233e509066dc3445d >> >> Hyracks Source >> https://dist.apache.org/repos/dist/dev/asterixdb/apache-hyracks-0.3.1-source-release.zip >> https://dist.apache.org/repos/dist/dev/asterixdb/apache-hyracks-0.3.1-source-release.zip.asc >> https://dist.apache.org/repos/dist/dev/asterixdb/apache-hyracks-0.3.1-source-release.zip.sha1 >> >> SHA1: 9b004555bb45f8aec234cee1be04b264d603685a >> >> AsterixDB NCService Installer: >> https://dist.apache.org/repos/dist/dev/asterixdb/asterix-server-0.9.1-binary-assembly.zip >> https://dist.apache.org/repos/dist/dev/asterixdb/asterix-server-0.9.1-binary-assembly.zip.asc >> https://dist.apache.org/repos/dist/dev/asterixdb/asterix-server-0.9.1-binary-assembly.zip.sha1 >> >> SHA1: 68efd7daa8f8cc758ac618e2acc0923f2896ffd0 >> >> AsterixDB Managix Installer >> https://dist.apache.org/repos/dist/dev/asterixdb/asterix-installer-0.9.1-binary-assembly.zip >> https://dist.apache.org/repos/dist/dev/asterixdb/asterix-installer-0.9.1-binary-assembly.zip.asc >> https://dist.apache.org/repos/dist/dev/asterixdb/asterix-installer-0.9.1-binary-assembly.zip.sha1 >> >> SHA1: b794d5bcf581cf253aa58dd17f1298256d6210f0 >> >> AsterixDB YARN Installer >> https://dist.apache.org/repos/dist/dev/asterixdb/asterix-yarn-0.9.1-binary-assembly.zip >> https://dist.apache.org/repos/dist/dev/asterixdb/asterix-yarn-0.9.1-binary-assembly.zip.asc >> https://dist.apache.org/repos/dist/dev/asterixdb/asterix-yarn-0.9.1-binary-assembly.zip.sha1 >> >> SHA1: 8292657dfb0b81ab1d99a1fd4e5c7f9723803e38 >> >> Additionally, a staged maven repository is available at: >> >> https://repository.apache.org/content/repositories/orgapacheasterix-1035/ >> >> The KEYS file containing the PGP keys used to sign the release can be >> found at >> >> https://dist.apache.org/repos/dist/release/asterixdb/KEYS >> >> RAT was executed as part of Maven via the RAT maven plugin, but >> excludes files that are: >> >> - data for tests >> - procedurally generated, >> - or source files which come without a header mentioning their license, >> but have an explicit reference in the LICENSE file. >> >> >> The vote is open for 72 hours, or until the necessary number of votes >> (3 +1) has been reached. >> >> Please vote >> [ ] +1 release these packages as Apache AsterixDB 0.9.1 and >> Apache Hyracks 0.3.1 >> [ ] 0 No strong feeling either way >> [ ] -1 do not release one or both packages because ... >> >> Thanks! >
