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

Disable swarm unique id on slave #650

Merged
merged 2 commits into from
Oct 21, 2016
Merged

Conversation

mterzo
Copy link
Contributor

@mterzo mterzo commented Oct 12, 2016

CI broke on older ruby, net-http-persistent 3.0 requires ruby 2.1, adding this change as well.

@jhoblitt jhoblitt added the enhancement New feature or request label Oct 12, 2016
@jhoblitt
Copy link
Member

I've restarted the failed travis job. It looks like the build slave went away mid-output.

@@ -60,6 +60,7 @@ JENKINS_USERNAME=<%= @quoted_ui_user %>
JENKINS_PASSWORD=<%= @quoted_ui_pass %>

OTHER_ARGS="<%= '-disableSslVerification' if @disable_ssl_verification -%>"
DISABLE_UNIQUE="<%= '-disableClientsUniqueId' if @disable_ssl_verification-%>"
Copy link

Choose a reason for hiding this comment

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

I believe this is using the wrong variable in the ERB template. Instead of disable_ssl_verification it should be disable_clients_unique_id

@rtyler rtyler added this to the 1.8.0 - Benson milestone Oct 12, 2016
@rtyler
Copy link

rtyler commented Oct 21, 2016

With #655 this may not be necessary anymore, but I don't think having an explicit option is necessarily a bad thing so I'm going to mergeymerge

@rtyler rtyler merged commit 550441e into voxpupuli:master Oct 21, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants