]> granicus.if.org Git - apache/commit
projects / apache / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e430837) | patch
Merge r1750507, r1750553 from trunk:
authorJim Jagielski <jim@apache.org>
Wed, 29 Jun 2016 17:30:07 +0000 (17:30 +0000)
committerJim Jagielski <jim@apache.org>
Wed, 29 Jun 2016 17:30:07 +0000 (17:30 +0000)
commit816d8b11cd0879aadb1925984a16990f37526464
tree1d04de018e941097e339b793ae9778869a169ed7tree | snapshot
parente430837f5dda29ed19d1f01250822bad51f6aea0commit | diff
Merge r1750507, r1750553 from trunk:

Fix proxy balancer lbmethod --enable defaults to follow proxy_balancer

Small change to r952007, ensure we don't wipe out the $enable_foomod value
when that value is 'shared'. The 'yes', 'shared', 'static' and 'no' values
are all valid.

Submitted by: wrowe
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1750684 13f79535-47bb-0310-9956-ffa450edef68
STATUS diff | blob | history
acinclude.m4 diff | blob | history
modules/proxy/balancers/config2.m4 diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.