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

Merge from unreleased/rs2 to release/1.4 #2826

Merged
merged 1 commit into from
Apr 25, 2017

Conversation

leirocks
Copy link
Contributor

@leirocks leirocks commented Apr 12, 2017

This includes all remaining fixes in RS2 (Windows 10 Creators Update)

@@ -621,6 +619,13 @@ bool Heap<TAlloc, TPreReservedAlloc>::AllocInPage(Page* page, size_t bytes, usho
return false;
}

//Section of the Page should already be freed.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this is duplicated?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's a bad merge on 9/2016...


In reply to: 111493100 [](ancestors = 111493100)

@dilijev dilijev added this to the 1.4.3 milestone Apr 25, 2017
This includes all internal fixes in windows RS2
@chakrabot chakrabot merged commit 02a02c3 into chakra-core:release/1.4 Apr 25, 2017
chakrabot pushed a commit that referenced this pull request Apr 25, 2017
Merge pull request #2826 from leirocks:release/1.4

This includes all internal fixes in windows RS2
chakrabot pushed a commit that referenced this pull request Apr 26, 2017
…e/1.4

Merge pull request #2826 from leirocks:release/1.4

This includes all internal fixes in windows RS2
chakrabot pushed a commit that referenced this pull request Apr 26, 2017
…rs2 to release/1.4

Merge pull request #2826 from leirocks:release/1.4

This includes all internal fixes in windows RS2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants