Dr/new rebase #4
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…config [WIP] Arbitrary config values
…rathon group names are reversed and appended to appname. '/a/b/app' becomes app-b-a as a service name
Now using golang:1.6.2 as a base for docker images
Add MesosDnsId field to Marathon App struct
Support HTTPS Marathon health checks
Just really want using {{ $task.Id }} in haproxy config template.
enable quote {{ $task.Id }}
Prepend slash to service ID in DELETE
Add tests for ServiceAPI
Fix Dockerfile for building Debian package
Dependencies Update
…ata is available in the haproxy config template to make richer decisions
Adding alive check to Task. Adding labels and split id to App. This d…
Fixing syntax issues
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@mlerner the diff is super gross here. I've started with upstream master, then rebased dr/deployed-master. Then I fixed the build and also changed the dockerfile since the newer golang base image used upstream actually had an older version of haproxy! This upgrade is hoping to fix QubitProducts#200 (comment) which may be what is ultimately causing our zombie haproxy. Note that dr/deployed-master is what is actually deployed. I will merge that back into master afterwards and get rid of the branch.