Yes. There were a number of important patches present in 1.x-branch that were not in 1.1.x-branch.
When I tried to merge 1.x-branch to 1.1.x-branch, I ran into unexpected conflicts. I thought about deleting 1.1.x-branch and recreating it, but decided against it, not wanting lose changes there that we might want to keep in case we wanted to revisit the contents of that branch. In the end I decided to cut the release from 1.x-branch. Jungtaek, I believe you created 1.1.x-branch… Do you know why/how it diverged? -Taylor > On Jul 25, 2017, at 12:08 PM, Stig Rohde Døssing <stigdoess...@gmail.com> > wrote: > > Is it on purpose that this is cut from 1.x-branch and not 1.1.x-branch? > > 2017-07-25 17:09 GMT+02:00 P. Taylor Goetz <ptgo...@gmail.com>: > >> This is a call to vote on releasing Apache Storm 1.1.1 (rc1) >> >> Full list of changes in this release: >> >> https://git-wip-us.apache.org/repos/asf?p=storm.git;a=blob_ >> plain;f=CHANGELOG.md;hb=88f0b8a45553ea960164fab18c736a5cdbae8e58 >> >> The tag/commit to be voted upon is v1.1.1: >> >> https://git-wip-us.apache.org/repos/asf?p=storm.git;a=tree;h= >> 89bf57855806d84dba8d9b7fe6e76f9074a6aa19;hb=88f0b8a45553ea960164fab18c736a >> 5cdbae8e58 >> >> The source archive being voted upon can be found here: >> >> https://dist.apache.org/repos/dist/dev/storm/apache-storm-1. >> 1.1-rc1/apache-storm-1.1.1-src.tar.gz >> >> Other release files, signatures and digests can be found here: >> >> https://dist.apache.org/repos/dist/dev/storm/apache-storm-1.1.1-rc1/ >> >> The release artifacts are signed with the following key: >> >> https://git-wip-us.apache.org/repos/asf?p=storm.git;a=blob_ >> plain;f=KEYS;hb=22b832708295fa2c15c4f3c70ac0d2bc6fded4bd >> >> The Nexus staging repository for this release is: >> >> https://repository.apache.org/content/repositories/orgapachestorm-1049 >> >> Please vote on releasing this package as Apache Storm 1.1.1. >> >> When voting, please list the actions taken to verify the release. >> >> This vote will be open for at least 72 hours. >> >> [ ] +1 Release this package as Apache Storm 1.1.1 >> [ ] 0 No opinion >> [ ] -1 Do not release this package because... >> >> Thanks to everyone who contributed to this release. >> >> -Taylor
