search

jglobus / JGlobus

jGlobus is a collection of Java client libraries for Globus® Toolkit security, GRAM, and GridFTP.
http://www.globus.org/toolkit/jglobus/
Apache License 2.0
24 stars 44 forks source link

Merge changes to master #128

Open ellert opened 10 years ago

ellert commented 10 years ago

Hi!

There seems to be a few commits that were only done in the 2.0.5 or 2.0.6 branches that were never merged into the 2.0 branch. And not all changes to the 2.0 branch were merged in the master. (The release notes for 2.0.6 only exists in the 2.0.6 branch and were never merged to 2.0 and master for examples, and there are others.) This is a consequence of the previous "fix in release branch then merge to master" workflow which was not always carried out to the end. We have since decided to change to a "fix in master then merge to release branch" workflow, which will avoid this problem, but some of the old sins needs to be taken care of.

It would be a pity if making a release from the master branch would reintroduce problems that were already fixed in some 2.x branch.

Can someone merge or cherrypick the relevant 2.0.5/2.0.6 changes (which should be most of them except for those that only massage the version number) to 2.0 and then merge or cherrypick the relevant 2.0 changes to master. (When merging to master from other branches be careful not to reintroduce dos line endings - this already happened once.)

kofemann commented 10 years ago

Hi Mathias,

you are absolutely right. We have to fix this situation. If you have some commits int the mibd just let me know and I will cherry-pick them into master as well.

Thanks, Tigran.