Yes, if the patch is critical issue that should be fixed in the RC. Its always a case-by-case decision. We only merged really critical issues into the "release-0.6" branch to reduce the testing overhead. I think most of the patches were issues we found while testing release candidates, so the patches were written for the "release-0.6" branch and applied to the master (not the other way around).
Hopefully the latest RC vote is the final vote ;) On Sat, Aug 16, 2014 at 12:58 AM, Henry Saputra <[email protected]> wrote: > Thanks Robert, so anyone that commit a patch to master should do the > cherry-pick to 0.6 branch as needed? > > - Henry > > On Thu, Aug 14, 2014 at 1:16 PM, Robert Metzger <[email protected]> > wrote: > > Yes. We did the split between "master" and "release-0.6" because we > > anticipated that our first Apache release might take a while and we > didn't > > want to let it block our entire development process. > > All fixes we applied to 0.6 and the current master were really small, > just > > a few lines of code. So we were always able to cherry-pick the commits > into > > master (or vice-versa). > > > > I hope that we have fixed all issues in the 0.6 release now so that we > can > > continue to commit to "master" only. > > > > > > On Thu, Aug 14, 2014 at 7:44 PM, Henry Saputra <[email protected]> > > wrote: > > > >> Does this mean every fix now need to be double fixed to master and 0.6 > >> branch? > >> > >> - Henry > >> > >> On Thu, Aug 14, 2014 at 7:39 AM, Robert Metzger <[email protected]> > >> wrote: > >> > Okay, I'll wait with the next release candidate until we have fixed > the > >> > critical windows issues. > >> > > >> > Just FYI for the other developers: I force-pushed into the release-0.6 > >> > branch. so take care when doing local merges / rebases. > >> > > >> > > >> > On Thu, Aug 14, 2014 at 4:08 PM, Fabian Hueske <[email protected]> > >> wrote: > >> > > >> >> I tested the setup on Windows and found some issues. > >> >> I fixed FLINK-1047, FLINK-1048, and FLINK-1051. Will add FLINK-1050 > to > >> >> setup documentation now. > >> >> > >> >> > >> >> 2014-08-13 16:59 GMT+02:00 Aljoscha Krettek <[email protected]>: > >> >> > >> >> > -1 > >> >> > Something is wrong with the cdh4 builds: Starting in local mode > yields > >> >> the > >> >> > following error in the log file: > >> >> > Exception in thread "main" java.lang.NoClassDefFoundError: > >> >> > org/codehaus/jettison/json/JSONException > >> >> > at > >> >> > > >> >> > > >> >> > >> > org.apache.flink.runtime.jobmanager.web.WebInfoServer.<init>(WebInfoServer.java:122) > >> >> > at > >> >> > > >> >> > > >> >> > >> > org.apache.flink.runtime.jobmanager.JobManager.startInfoServer(JobManager.java:1154) > >> >> > at > >> >> > > >> org.apache.flink.runtime.jobmanager.JobManager.main(JobManager.java:318) > >> >> > Caused by: java.lang.ClassNotFoundException: > >> >> > org.codehaus.jettison.json.JSONException > >> >> > at java.net.URLClassLoader$1.run(URLClassLoader.java:372) > >> >> > at java.net.URLClassLoader$1.run(URLClassLoader.java:361) > >> >> > at java.security.AccessController.doPrivileged(Native Method) > >> >> > at java.net.URLClassLoader.findClass(URLClassLoader.java:360) > >> >> > at java.lang.ClassLoader.loadClass(ClassLoader.java:424) > >> >> > at > sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308) > >> >> > at java.lang.ClassLoader.loadClass(ClassLoader.java:357) > >> >> > ... 3 more > >> >> > > >> >> > > >> >> > > >> >> > On Wed, Aug 13, 2014 at 3:51 PM, Robert Metzger < > [email protected]> > >> >> > wrote: > >> >> > > >> >> > > Hi All, > >> >> > > > >> >> > > Please vote on releasing the following artifacts as Apache Flink > 0.6 > >> >> > > incubating. This will be the first release for Flink since > entering > >> the > >> >> > > Apache Incubator. > >> >> > > > >> >> > > > >> >> > > The commit to be voted upon: > >> >> > > * > >> >> > http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/877b585d > >> >> > > < > >> >> > http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/877b585d > >> >> > >* > >> >> > > > >> >> > > The artifacts to be voted on are located here: > >> >> > > *http://people.apache.org/~rmetzger/flink-0.6-incubating-rc5/ > >> >> > > <http://people.apache.org/~rmetzger/flink-0.6-incubating-rc5/>* > >> >> > > > >> >> > > The GPG key (D9839159) used to sign the release is available at: > >> >> > > https://dist.apache.org/repos/dist/release/incubator/flink/KEYS > >> >> > > > >> >> > > I can not provide a staged maven repository at this point, since > >> >> > > repository.apache.org is down. I already contacted infra and > hope > >> >> that I > >> >> > > can give you the link in a few hours. > >> >> > > > >> >> > > > >> >> > > > >> >> > > Please vote on releasing this package as Apache Flink 0.6 > >> incubating. > >> >> > > > >> >> > > The vote is open for the next 72 hours and passes if a majority > of > >> >> > > at least three +1 PPMC votes are cast. > >> >> > > > >> >> > > [ ] +1 Release this package as Apache Flink 0.6-incubating > >> >> > > [ ] 0 I don't feel strongly about it, but I'm okay with the > release > >> >> > > [ ] -1 Do not release this package because... > >> >> > > > >> >> > > >> >> > >> >
