kindy lin
|
92e0dd7abf
|
Merge commit 'v1.1.12.5' into nginx-1.1.x
|
2012-01-19 17:56:42 +08:00 |
|
kindy lin
|
86af3896ba
|
bumped version number to 1.1.12.5
|
2012-01-19 17:56:16 +08:00 |
|
kindy lin
|
065bf15551
|
Merge commit 'v1.1.12.5' into nginx-1.1.x
|
2012-01-19 17:51:25 +08:00 |
|
kindy lin
|
d9782b738d
|
remove upstream_keepalive from util/configure
|
2012-01-19 17:50:24 +08:00 |
|
kindy lin
|
5abfef061a
|
merge nginx-1.1.x version (util/ver)
|
2012-01-19 17:20:19 +08:00 |
|
kindy lin
|
7ce68bd980
|
bumped version number to 1.1.12.4, with v1.0.10.44 merged
|
2012-01-19 17:17:12 +08:00 |
|
kindy lin
|
cbb2c2f247
|
Merge commit 'v1.0.10.44' into nginx-1.1.12
Conflicts:
util/ver
|
2012-01-19 17:16:24 +08:00 |
|
kindy lin
|
e96bacd8fd
|
remove ngx_http_upstream_keepalive in util/configure
|
2012-01-18 19:44:24 +08:00 |
|