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

Revert 27962 #28083

Closed
wants to merge 17 commits into from
Closed

Revert 27962 #28083

wants to merge 17 commits into from

Conversation

sam-github
Copy link
Contributor

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines

sam-github added 17 commits June 5, 2019 15:19
@nodejs-github-bot
Copy link
Collaborator

@sam-github
Copy link
Contributor Author

I suggest this be fast-tracked when it passes CI, it fixes test failures introduced in #27962

Please thumbs-up this if you agree.

Copy link
Member

@addaleax addaleax left a comment

Choose a reason for hiding this comment

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

👍 to fast-tracking

@sam-github sam-github added the fast-track PRs that do not need to wait for 48 hours to land. label Jun 5, 2019
@addaleax addaleax added the test Issues and PRs related to the tests. label Jun 5, 2019
@sam-github
Copy link
Contributor Author

As a heads-up, I won't be available for a couple hours to land this, so if it gets some fasttrack votes and passes CI, anyone who has the time feel free to land it.

refack pushed a commit to refack/node that referenced this pull request Jun 5, 2019
PR-URL: nodejs#28083
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Ali Ijaz Sheikh <[email protected]>
Reviewed-By: Trivikram Kamat <[email protected]>
Reviewed-By: Refael Ackermann (רפאל פלחי) <[email protected]>
@refack
Copy link
Contributor

refack commented Jun 5, 2019

Fast-track landed in 965ffc4

@refack refack closed this Jun 5, 2019
@nodejs-github-bot
Copy link
Collaborator

@refack
Copy link
Contributor

refack commented Jun 5, 2019

https://ci.nodejs.org/job/node-test-commit/29189/ ✔️

Re running CI since there seems to get some git whitespace artifacts when rebasing.

 test/fixtures/msca.pem | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/test/fixtures/msca.pem b/test/fixtures/msca.pem
index 247368e625..82ae5e1bec 100644
--- a/test/fixtures/msca.pem
+++ b/test/fixtures/msca.pem
CRLF->LF

 test/fixtures/foafssl.key | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/fixtures/foafssl.key b/test/fixtures/foafssl.key
index 62e953a67f..facbec5541 100644
--- a/test/fixtures/foafssl.key
+++ b/test/fixtures/foafssl.key
@@ -1,6 +1,6 @@
 Bag Attributes
     friendlyName: Me's Not a Certification Authority ID
-    localKeyID: 98 CC 02 91 83 8D 14 4A 60 40 B7 11 E8 EF A9 01 4B D7 16 8A 
+    localKeyID: 98 CC 02 91 83 8D 14 4A 60 40 B7 11 E8 EF A9 01 4B D7 16 8A
 Key Attributes: <No Attributes>
 -----BEGIN PRIVATE KEY-----
 MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCm9EqcJXkUMSFP

 test/fixtures/foafssl.crt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/fixtures/foafssl.crt b/test/fixtures/foafssl.crt
index f4b5905e37..4a95dcd714 100644
--- a/test/fixtures/foafssl.crt
+++ b/test/fixtures/foafssl.crt
@@ -1,6 +1,6 @@
 Bag Attributes
     friendlyName: Me's Not a Certification Authority ID
-    localKeyID: 98 CC 02 91 83 8D 14 4A 60 40 B7 11 E8 EF A9 01 4B D7 16 8A 
+    localKeyID: 98 CC 02 91 83 8D 14 4A 60 40 B7 11 E8 EF A9 01 4B D7 16 8A
 subject=/O=FOAF+SSL/OU=The Community Of Self Signers/UID=http://example.com/#me/CN=Me
 issuer=/O=FOAF+SSL/OU=The Community of Self Signers/CN=Not a Certification Authority
 -----BEGIN CERTIFICATE-----

@sam-github sam-github deleted the revert-27962 branch June 6, 2019 00:08
@sam-github
Copy link
Contributor Author

thanks @refack

BridgeAR pushed a commit that referenced this pull request Jun 17, 2019
PR-URL: #28083
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Ali Ijaz Sheikh <[email protected]>
Reviewed-By: Trivikram Kamat <[email protected]>
Reviewed-By: Refael Ackermann (רפאל פלחי) <[email protected]>
@BridgeAR BridgeAR mentioned this pull request Jun 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
fast-track PRs that do not need to wait for 48 hours to land. test Issues and PRs related to the tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants