4c52b11 Merge branch 'master' into el6/master

Merged and Committed by peter 13 years ago
21 files changed. 270 lines added. 14935 lines removed.
couchdb-0001-Force-init-script-installation.patch
file modified
+2 -2
couchdb-0002-Install-into-erllibdir-by-default.patch
file modified
+2 -2
couchdb-0003-Remove-bundled-erlang-oauth-library.patch
file modified
+2 -2
couchdb-0004-Remove-bundled-erlang-etap-library.patch
file modified
+2 -2
couchdb-0005-Remove-bundled-mochiweb-library.patch
file modified
+2 -2
couchdb-0006-Remove-bundled-ibrowse-library.patch
file modified
+2 -2
couchdb-0007-Workaround-for-system-wide-ibrowse.patch
file modified
+2 -2
couchdb-0008-Remove-pid-file-after-stop.patch
file modified
+2 -2
couchdb-0009-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
file modified
+2 -2
couchdb-0010-Do-not-install-gzipped-docs.patch
file added
+220
couchdb-0011-Fix-respawn-timeout-to-match-default-value.patch
file added
+24
couchdb-1.0.0-0001-Force-init-script-installation.patch
file removed
-39
couchdb-1.0.0-0002-Install-into-erllibdir-by-default.patch
file removed
-34
couchdb-1.0.0-0003-Remove-bundled-erlang-oauth-library.patch
file removed
-964
couchdb-1.0.0-0004-Remove-bundled-erlang-etap-library.patch
file removed
-1912
couchdb-1.0.0-0005-Remove-bundled-mochiweb-library.patch
file removed
-7750
couchdb-1.0.0-0006-Remove-bundled-ibrowse-library.patch
file removed
-4088
couchdb-1.0.0-0007-Workaround-for-system-wide-ibrowse.patch
file removed
-68
couchdb-1.0.0-0008-Remove-pid-file-after-stop.patch
file removed
-28
couchdb-1.0.0-0009-deleting-a-DB-while-it-was-being-opened-would-crash-.patch
file removed
-26
couchdb.spec
file modified
+8 -8
    Merge branch 'master' into el6/master
    
        
file modified
+8 -8