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

Commit 24aeb6a

Browse files
committedDec 5, 2017
meta: merge node/master into node-chakracore/master
Merge bb44626 as of 2017-11-26 This commit was automatically generated. For any problems, please contact jackhorton Reviewed-By: chakrabot <[email protected]>
2 parents 3a6b048 + bb44626 commit 24aeb6a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+967
-577
lines changed
 

‎benchmark/zlib/creation.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const bench = common.createBenchmark(main, {
1212

1313
function main(conf) {
1414
const n = +conf.n;
15-
const fn = zlib['create' + conf.type];
15+
const fn = zlib[`create${conf.type}`];
1616
if (typeof fn !== 'function')
1717
throw new Error('Invalid zlib type');
1818
var i = 0;

‎common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
# Reset this number to 0 on major V8 upgrades.
3131
# Increment by one for each non-official patch applied to deps/v8.
32-
'v8_embedder_string': '-node.11',
32+
'v8_embedder_string': '-node.12',
3333

3434
# Enable disassembler for `--print-code` v8 options
3535
'v8_enable_disassembler': 1,

0 commit comments

Comments
 (0)