Skip to content
This repository has been archived by the owner on Mar 29, 2021. It is now read-only.

Hunter 0.9.2 #3

Merged
merged 4 commits into from
Oct 16, 2017
Merged

Hunter 0.9.2 #3

merged 4 commits into from
Oct 16, 2017

Conversation

isaachier
Copy link

Second attempt.

}
else if(protocol == SSLv3)
{
#ifndef OPENSSL_NO_SSL3
Copy link

Choose a reason for hiding this comment

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

Please use separate commit for this change. I guess it's not related to CMake.

Copy link
Author

Choose a reason for hiding this comment

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

I guess not but it does relate to default version of OpenSSL in Hunter. Seems to be older versions don't need this fix according to this pull request: apache#1102.

Copy link

Choose a reason for hiding this comment

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

I guess not but it does relate to default version of OpenSSL in Hunter

Not sure I follow. It's not about CMake or Hunter. This change is about C++ code. Make a separate commit with this change.

according to this pull request: apache#1102

Please add this link to commit too. Effectively it means we have two commits here.

@@ -0,0 +1,121 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
Copy link

Choose a reason for hiding this comment

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

Is it cherry-picked from hunter-0.10.0 branch? Can you add a note about it? Is there any difference?

Copy link
Author

Choose a reason for hiding this comment

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

CMake build seems to be new. Essentially checked out all CMake stuff from 0.10.0, then changed source files to match 0.9.2. Where should I add the note?

Copy link

Choose a reason for hiding this comment

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

Essentially checked out all CMake stuff from 0.10.0

Commit 1: "CMake stuff from hunter-0.10.0 branch"

then changed source files to match 0.9.2

Commit 2 (I guess it's 1d24cc9 already?)

@@ -0,0 +1,121 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
Copy link

Choose a reason for hiding this comment

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

Essentially checked out all CMake stuff from 0.10.0

Commit 1: "CMake stuff from hunter-0.10.0 branch"

then changed source files to match 0.9.2

Commit 2 (I guess it's 1d24cc9 already?)

}
else if(protocol == SSLv3)
{
#ifndef OPENSSL_NO_SSL3
Copy link

Choose a reason for hiding this comment

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

I guess not but it does relate to default version of OpenSSL in Hunter

Not sure I follow. It's not about CMake or Hunter. This change is about C++ code. Make a separate commit with this change.

according to this pull request: apache#1102

Please add this link to commit too. Effectively it means we have two commits here.

@isaachier
Copy link
Author

OK should be fixed now.

}
else if(protocol == SSLv3)
{
#ifndef OPENSSL_NO_SSL3
Copy link

Choose a reason for hiding this comment

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

Copy link
Author

Choose a reason for hiding this comment

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

Oh wrong commit. Hold on...

Copy link

@ruslo ruslo left a comment

Choose a reason for hiding this comment

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

@isaachier
Copy link
Author

Done

@ruslo ruslo merged commit 4e6b6f7 into hunter-packages:hunter-0.9.2 Oct 16, 2017
@ruslo
Copy link

ruslo commented Oct 16, 2017

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants