Merge pull request #2077 from atom/iojs-latest

Update to io.js v2.3.1
2015-06-29 12:41:38 +08:00 · 2015-06-29 12:41:38 +08:00 · b508346ed8
commit b508346ed8
parent 1e514620b5 04de1aa51d
3 changed files with 3 additions and 2 deletions
--- a/common.gypi
+++ b/common.gypi
@ -8,6 +8,7 @@
    # Reflects node's config.gypi.
    'component%': 'static_library',
    'python': 'python',
+    'openssl_fips': '',
    'openssl_no_asm': 1,
    'node_target_type': 'shared_library',
    'node_install_npm': 'false',
--- a/vendor/brightray
+++ b/vendor/brightray
@ -1 +1 @@
-Subproject commit 2b09a88fc19e1270842ca7d74b6d96515041ee13
+Subproject commit 89f8520322a1580657febac6529b2a2ead70f327
--- a/vendor/node
+++ b/vendor/node
@ -1 +1 @@
-Subproject commit ab1b3ba0b0076d7aa72e80caf8045fb6f7a68be0
+Subproject commit d6d818d4d20f0047ea5b8648b3e255b02268f35f