Skip to content
This repository has been archived by the owner on Nov 9, 2022. It is now read-only.

Fixed #753: added new use-https-for-rest property #767

Merged
merged 1 commit into from
May 31, 2017

Conversation

grtjn
Copy link
Contributor

@grtjn grtjn commented May 26, 2017

Fixes #753

@grtjn grtjn added this to the April 2017 milestone May 26, 2017
@@ -2236,7 +2236,7 @@ def mlRest
:http_connection_open_timeout => @properties["ml.http.open-timeout"].to_i,
:http_connection_read_timeout => @properties["ml.http.read-timeout"].to_i,
:http_connection_retry_delay => @properties["ml.http.retry-delay"].to_i,
:use_https_for_rest => @properties["ml.ssl-certificate-template"].present?
:use_https_for_rest => @properties["ml.ssl-certificate-template"].present? or @properties["ml.use-https-for-rest"] == "true"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Typo.. or should be ||

@grtjn grtjn force-pushed the 753-use-https-for-rest branch from 2eb242b to 0f0ede4 Compare May 28, 2017 19:17
@RobertSzkutak
Copy link
Contributor

Pretty simple change. Looks good to me.

@RobertSzkutak RobertSzkutak merged commit 2900ffc into marklogic-community:dev May 31, 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