Skip to content
This repository has been archived by the owner on Dec 13, 2018. It is now read-only.

Add extra options as files #184

Merged
merged 4 commits into from
Apr 5, 2017
Merged

Add extra options as files #184

merged 4 commits into from
Apr 5, 2017

Conversation

markvr
Copy link
Contributor

@markvr markvr commented Apr 3, 2017

See #180

Mark van Rossum added 4 commits April 3, 2017 10:07
Added config for:
a84cda4 
EXTRA_DEFAULT_SETTINGS_FILE
EXTRA_GLOBAL_SETTINGS_FILE
EXTRA_FRONTEND_SETTINGS_FILE_XXX
ADDITIONAL_BACKEND_SETTINGS_FILE_XXX
correct typo in filename
491a561
update readme
48eb86c
correct error in backend
fc3dc23
@markvr markvr mentioned this pull request Apr 3, 2017
Closed
@tifayuki tifayuki changed the base branch from master to staging April 5, 2017 21:19
@tifayuki tifayuki merged commit 4b5aa2a into docker-archive:staging Apr 5, 2017
@tifayuki
Copy link
Contributor

tifayuki commented Apr 5, 2017

@markvr
I have merged the PR into staging branch, and the changes can be found in dockercloud/haproxy:staging image.

This will be published in the next release.
Thank you.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@markvr @tifayuki