[couchdb/el6/master: 3/3] Merge branch 'master' into el6/master

Peter Lemenkov peter at fedoraproject.org
Tue Oct 12 11:18:37 UTC 2010


commit 064583d6de64a09070ffba7afc211c56a7504eb8
Merge: 4c52b11 e1d33e6
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Oct 12 15:18:33 2010 +0400

    Merge branch 'master' into el6/master

 .gitignore                                         |    1 +
 couchdb-0001-Force-init-script-installation.patch  |    6 +-
 ...db-0002-Install-into-erllibdir-by-default.patch |    6 +-
 ...-0003-Remove-bundled-erlang-oauth-library.patch |    6 +-
 ...b-0004-Remove-bundled-erlang-etap-library.patch |    6 +-
 couchdb-0005-Remove-bundled-mochiweb-library.patch |    6 +-
 couchdb-0006-Remove-bundled-ibrowse-library.patch  |    6 +-
 ...b-0007-Workaround-for-system-wide-ibrowse.patch |    6 +-
 couchdb-0008-Remove-pid-file-after-stop.patch      |    6 +-
 ...DB-while-it-was-being-opened-would-crash-.patch |    6 +-
 couchdb-0010-Do-not-install-gzipped-docs.patch     |    6 +-
 ...ix-respawn-timeout-to-match-default-value.patch |    6 +-
 ...2-Relax-curl-dependency-to-7.15-for-RHEL5.patch |  100 ++++++++++++++++++++
 ...-No-erlang-min-2-and-erlang-max-2-in-R12B.patch |   78 +++++++++++++++
 couchdb.spec                                       |   18 +++-
 15 files changed, 228 insertions(+), 35 deletions(-)
---


More information about the scm-commits mailing list