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

Respect tokens in maintenance mode #1230

Merged
merged 2 commits into from
Sep 10, 2015
Merged

Respect tokens in maintenance mode #1230

merged 2 commits into from
Sep 10, 2015

Conversation

ryanuber
Copy link
Member

ACL tokens now get threaded through during check registration for maint mode. Fixes #1223

@ryanbreen
Copy link
Contributor

👍

@slackpad
Copy link
Contributor

LGTM

ryanuber added a commit that referenced this pull request Sep 10, 2015
Respect tokens in maintenance mode
@ryanuber ryanuber merged commit 1908c16 into master Sep 10, 2015
@ryanuber ryanuber deleted the f-maintfix branch September 10, 2015 19:30
@slackpad
Copy link
Contributor

Picked this up when @sfncook rebased and built #1187 - @ryanuber I think we missed a couple spots:

command/maint_test.go:48: not enough arguments in call to a1.agent.EnableServiceMaintenance
command/maint_test.go:53: not enough arguments in call to a1.agent.EnableNodeMaintenance

@slackpad
Copy link
Contributor

I'm testing a fix and I'll PR.

@sfncook
Copy link

sfncook commented Sep 10, 2015

@slackpad - Actually I hadn't done a rebase/merge from the master branch for a while. Just did so and pushed to my PR #1187 It's building now.

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.

4 participants