| commit | 963cfe6929d09228d7b77036a076cc4dce8a5f8c | |
| author | Augusto Bott <augusto@bott.com.br> | |
| Thu, 15 Dec 2011 21:52:42 +0000 (15 19:52 -0200) | ||
| committer | Augusto Bott <augusto@bott.com.br> | |
| Thu, 15 Dec 2011 21:52:42 +0000 (15 19:52 -0200) | ||
| tree | 01c2fb296b0e39b23c506486c6f16740cffe7102 | tree |
| parent | 8ba46bf4cce6bf6deb9b972f83e9d7617060bed4 | commitdiff |
| parent | 3f635f8630c1c151f4840e1166fd1ceeca475de4 | commitdiff |
Merge branch 'Teaman-ND' into Teaman-ND-SDHC
* Teaman-ND:
cstats/rstats: wait for any gzip children to complete at shutdown
rc: add debug option for testing alternative rc binaries
cstats: delay sending additional SIGTERMs if a there's a gzip process running
cstats/rstats: allow more time between SIGTERMs at shutdown
* Teaman-ND:
cstats/rstats: wait for any gzip children to complete at shutdown
rc: add debug option for testing alternative rc binaries
cstats: delay sending additional SIGTERMs if a there's a gzip process running
cstats/rstats: allow more time between SIGTERMs at shutdown
| release/src/router/rc/services.c | diff1 | diff2 | blobhistory |