[cherokee/el4/master: 37/37] Merge branch 'master' into el4
Lorenzo Villani
arbiter at fedoraproject.org
Sun Aug 29 14:38:01 UTC 2010
commit f24b2c09f5a1a08a4a95652d0809100045df986c
Merge: d3cc439 5f319b4
Author: Lorenzo Villani <lvillani at binaryhelix.net>
Date: Sun Aug 29 16:37:53 2010 +0200
Merge branch 'master' into el4
Conflicts:
.gitignore
cherokee.init
cherokee.spec
sources
.gitignore | 1 +
01-drop-privileges.patch | 13 ++++
cherokee.init | 144 ++++++++++++++++++++++++++++++----------------
cherokee.spec | 34 ++++++++++-
sources | 2 +-
5 files changed, 141 insertions(+), 53 deletions(-)
---
diff --cc cherokee.init
index 29b8710,f8ffbb0..f8ffbb0
mode 100644,100755..100644
--- a/cherokee.init
+++ b/cherokee.init
More information about the scm-commits
mailing list