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

Fix for issue 1025 [RCS-358] #1305

Merged
merged 6 commits into from
Mar 21, 2016
Merged

Fix for issue 1025 [RCS-358] #1305

merged 6 commits into from
Mar 21, 2016

Conversation

tburghart
Copy link

This merges branches bugfix/cs1025 with current 2.1 (for full-suite testing) and replaces the hard-coded host/port destinations for the ssl object copy test with values from the configuration.

It's smaller to merge back to 2.1 than back to bugfix/cs1025, so it supersedes #1300

kuenishi and others added 6 commits March 15, 2016 14:38
SSL setup is a little kludgy way using direct RPC function call to
create initial admin user, if SSL configuration is included in
`rtcs` setup config argument.

This also adds hand-made S3 client that uses ssl module, because
all available S3 clients does not assume HTTPS access via proxy
host/port (for security, of course, yes). But for local tests it is
inconvenient to test HTTPS requests.

Note that `https_tests` does not pass integration testing in this
commit.
@kuenishi
Copy link
Contributor

+1 772902c

borshop added a commit that referenced this pull request Mar 21, 2016
Fix for issue 1025 [RCS-358]

Reviewed-by: kuenishi
@kuenishi
Copy link
Contributor

@borshop merge

@borshop borshop merged commit 772902c into 2.1 Mar 21, 2016
@kuenishi kuenishi deleted the basho-trb-rcs-358-alt branch March 21, 2016 22:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants