Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

Merge nodejs/master #198

Merged
merged 0 commits into from
Mar 24, 2017
Merged

Merge nodejs/master #198

merged 0 commits into from
Mar 24, 2017

Conversation

kunalspathak
Copy link
Member

Merge nodejs/node@348cc80 as of 2017-03-23

Fixes: #187

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines
Affected core subsystem(s)

test

@kunalspathak
Copy link
Member Author

@digitalinfinity - Please review.

return false;
});
}
assert.strictEqual(util.format('%j', o), '[Circular]');
Copy link
Contributor

Choose a reason for hiding this comment

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

Curious- do we know how this works now?

Copy link
Member Author

Choose a reason for hiding this comment

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

Sorry, didn't understand your question. this means what?

kunalspathak added a commit to kunalspathak/node-chakracore that referenced this pull request Mar 24, 2017
Merge nodejs/node@348cc80
as of 2017-03-23

PR-URL: nodejs#198
Signed-off-by: Hitesh Kanwathirtha <[email protected]>
kunalspathak added a commit to kunalspathak/node-chakracore that referenced this pull request Mar 24, 2017
Reverted nodejs@374a1d8 because
nodejs/node#11854 is present in upstream.

Updated v8-version

PR-URL: nodejs#198
Signed-off-by: Hitesh Kanwathirtha <[email protected]>
@kunalspathak kunalspathak merged commit a35216f into nodejs:xplat Mar 24, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants