Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pick up changes from master to 2.065 branch #1939

Merged
merged 6 commits into from Feb 16, 2014
Merged

Pick up changes from master to 2.065 branch #1939

merged 6 commits into from Feb 16, 2014

Conversation

9rnsr
Copy link
Contributor

@9rnsr 9rnsr commented Feb 15, 2014

Three regression fixes:
[REG2.065a] Issue 12071 - Algebraic won't take delegate returning structure
[REG2.065a] Issue 12168 - Add ref to array() and object() of JSONValue getters to add new element
[REG2.065a] Issue 12135 - [AA] Format tail after associative array value is treated as separator if explicit separator is empty

Other trivial fixes:
#1913 Change documentation to match parameter name.
#1885 Fix Issue 12003 - std\zip.d(421): Deprecation

AndrejMitrovic and others added 6 commits February 15, 2014 15:38
Change documentation to match parameter name.
…bject-getter

Add ref to array() and object() of JSONValue getters to add new element
[REG2.065a] Issue 12071 - Algebraic won't take delegate returning structure
Fix Issue 12003 - std\zip.d(421): Deprecation
[REG2.065a] Issue 12135 - [AA] Format tail after associative array value is treated as separator if explicit separator is empty
@9rnsr
Copy link
Contributor Author

9rnsr commented Feb 15, 2014

@AndrewEdwards I found a mistake of your cherry-pick.

In the commit 8442202, you changed the constraint in std.algorithm.swap for proxySwap, but the change was not correct for 2.065 branch. (it was a part of #1858, but #1858 is not yet chery-picked in release branch.)

So I revert the change in 2.065. See the last commit.

@9rnsr
Copy link
Contributor Author

9rnsr commented Feb 16, 2014

Auto-merge toggled on

9rnsr added a commit that referenced this pull request Feb 16, 2014
Pick up changes from master to 2.065 branch
@9rnsr 9rnsr merged commit 1475794 into dlang:2.065 Feb 16, 2014
@AndrewEdwards
Copy link
Contributor

Thanks Kenji. I just got into the house and started working on preparing the next release.

@9rnsr 9rnsr deleted the 2.065 branch February 16, 2014 05:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants