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.

Sign up for GitHub

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

Jump to bottom

Adds a brief wait and poll period to update check status after a timeout. #3573

Merged
merged 2 commits into from
Oct 12, 2017
Merged

Adds a brief wait and poll period to update check status after a timeout. #3573

merged 2 commits into from
Oct 12, 2017

Conversation

slackpad
Copy link
Contributor

Fixes #3570

@slackpad
Adds a brief wait and poll period to update the check status
b09ef35 
if we get stucking waiting for the processes to terminate.

Fixes #3570
@slackpad slackpad merged commit c943b1b into master Oct 12, 2017
@slackpad slackpad deleted the issue-3570 branch October 12, 2017 20:49
michaelw pushed a commit to michaelw/consul that referenced this pull request Jan 11, 2018
Merge tag 'v1.0.0' into instart/master
02c6472 
Version 1.0.0

* tag 'v1.0.0': (455 commits)
  Release v1.0.0
  Puts the tree in 1.0 final release mode.
  Fixes an XSS issue with unescaped node names. (hashicorp#3578)
  Adds a note about the Raft protocol not being the same as the Consul protocol.
  Adds a 1.0 section to the upgrade guide and cleans up the change log.
  Update sentinel.html.markdown.erb
  Update dns forwarding documentation (hashicorp#3574)
  Adds a brief wait and poll period to update check status after a timeout. (hashicorp#3573)
  Cleans up some drift between the OSS and Enterprise trees.
  Clarify the docs around script check timeout behavior
  Updates the change log.
  Kill check processes after the timeout is reached (hashicorp#3567)
  Updates the change log.
  retry locks on network errors (hashicorp#3553)
  Fix example code formatting in godoc
  config: remove redundant code
  config: fix check for segment.port <= 0 and add test
  Adds check to make sure port is given so we avoid a nil bind address.
  Removes obsolete segment stub.
  agent: add option to discard health output (hashicorp#3562)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kyhavlov kyhavlov kyhavlov approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@slackpad @kyhavlov