summaryrefslogtreecommitdiff
path: root/rel/overlay
AgeCommit message (Collapse)Author
2011-10-04Merge remote branch 'apache/1.1.x'Adam Kocoloski
2011-09-28Merge 1.1.x because Paul Davis kept his important bug fix super secret while ↵Robert Newson
I was slaving away on this merge for two days.
2011-09-28Merge 1.1.x changesRobert Newson
Conflicts: apps/couch/include/couch_db.hrl apps/couch/src/couch_db.erl apps/couch/src/couch_os_process.erl apps/couch/src/couch_query_servers.erl apps/couch/src/couch_rep.erl apps/couch/src/couch_replication_manager.erl apps/couch/src/couch_view_compactor.erl apps/couch/src/couch_view_group.erl apps/couch/src/couch_view_updater.erl configure.ac couchjs/c_src/http.c couchjs/c_src/main.c couchjs/c_src/utf8.c etc/windows/couchdb.iss.tpl src/couchdb/priv/Makefile.am src/couchdb/priv/couch_js/main.c test/etap/160-vhosts.t test/etap/200-view-group-no-db-leaks.t test/etap/Makefile.am BugzID: 12645
2011-09-27set cluster_ssl correctly, and tidy chttps section.Robert Newson
2011-09-26add https support.benoitc
2011-08-12include new share/www files missed in the 1.1 merge.Robert Newson
2011-07-05Restart replications on errorFilipe David Borba Manana
If a replication transitions to the "error" state, attempt to restart it up to "max_replication_retry_count" times (.ini configuration parameter). This number of retry attempts can now be set to "infinity" as well. This was already current behaviour in trunk (upcoming 1.2). Closes COUCHDB-1194. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1142258 13f79535-47bb-0310-9956-ffa450edef68 Conflicts: apps/couch/src/couch_rep.erl
2011-06-13Merge CouchDB 1.1Robert Newson
2011-04-08add Solaris build support.Robert Newson
2011-02-13Move new attachment_conflicts test to the overlayAdam Kocoloski
2011-01-28COUCHDB-1047 - support inclusive_end with reduce callsRobert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@1064800 13f79535-47bb-0310-9956-ffa450edef68
2011-01-20Merge CouchDB 1.0.2 release candidateAdam Kocoloski
Conflicts: Makefile.am acinclude.m4.in apps/couch/src/couch_db.erl apps/couch/src/couch_db_updater.erl apps/couch/src/couch_rep.erl apps/couch/src/couch_rep_reader.erl apps/couch/src/couch_view.erl apps/couch/src/couch_view_group.erl rel/overlay/etc/default.ini share/Makefile.am src/couchdb/couch_query_servers.erl src/ibrowse/Makefile.am src/ibrowse/ibrowse.app.in src/ibrowse/ibrowse.erl src/ibrowse/ibrowse_app.erl src/ibrowse/ibrowse_http_client.erl src/ibrowse/ibrowse_lb.erl src/ibrowse/ibrowse_lib.erl src/ibrowse/ibrowse_sup.erl src/ibrowse/ibrowse_test.erl src/mochiweb/mochijson2.erl test/etap/112-replication-missing-revs.t test/etap/113-replication-attachment-comp.t test/etap/140-attachment-comp.t
2011-01-11revert commit, fixed in wrong placeRobert Dionne
2011-01-11change default quorum to w=n to help issue #27 in api-testsRobert Dionne
2011-01-06Refactor OS process managementAdam Kocoloski
Squashed commit of the following: commit a9cd9681f6c88f0f3c019e98e2edfef55cad0129 commit eb38bca08ffbf778b69fbb2d612e23733af82ff5 commit 98a03a079ab24f2c7bd9e0d6d7fac5fa62bfd4eb commit 9b8ec059165d981e4cd743008ecdf393a4f37f61 commit 3a891c1dd9a17fdd267c423b340dd09c31c89d7a commit 68351dd181c8a92b5baa9ac23f25c7c191484394 commit e4384a517e2efeac9231701898a6c67213642319 commit cd954661422d0ef146b5bd7792f835dcc4220c84 commit 3bcca92c7c0102d5722dfc6b2c332766cfe0370c commit 82d15f40f503b2609cf785ce2837e1280edaaa43 commit 70051abbd699e076452d772587c32ee5e09bdcbc commit 7f01d37781e7774015f6cb34f795b28db9ecc9f5 BugzID: 11572 See also COUCHDB-901 A new config setting is introduced. The following block controls the maximum number of OS processes that will be reused. Additional OS processes will still be spawned on-demand, but they'll be terminated when the clients are through with them. [query_server_config] os_process_soft_limit = 100
2010-12-31switch from bash to sh per issue #29joewilliams
2010-09-03remove some unused/obsolete config settingsAdam Kocoloski
2010-08-29only display counter portion of cluster update_seq in FutonAdam Kocoloski
We should provide access to the full sequence in Futon somehow, as it's useful for things like changes since "now".
2010-08-27use couchspawnkillable from privdir instead of overlayAdam Kocoloski
2010-08-27add couchspawnkillable back, for viewsBrad Anderson
2010-08-27my name is BigCouchAdam Kocoloski
2010-08-27remove mentions of _metrics from default.inijoewilliams
2010-08-27Apache 2 license, Cloudant copyright when appropriateAdam Kocoloski
2010-08-27Erlang shell should not be the defaultAdam Kocoloski
2010-08-27configure ports and node names, also correct a few bugsAdam Kocoloski
2010-08-27read Erlang VM arguments from config fileAdam Kocoloski
2010-08-26log to var/log/dbcore.log by defaultAdam Kocoloski
2010-08-26move futon to share/wwwAdam Kocoloski
2010-08-26move main.js to share/couchjsAdam Kocoloski
2010-08-24fix determination of ROOTDIRAdam Kocoloski
2010-08-23install directly to {{prefix}}Adam Kocoloski
2010-08-23no more rebar templates in configureAdam Kocoloski
2010-08-20build couchjs with sconsBrad Anderson
2010-08-19make dist back in working order, and dbcore starts successfullyBrad Anderson
2010-08-18clear out root folder a bit, moving couch bits into apps/couch or rel/Brad Anderson
2010-08-11move futon into release overlayAdam Kocoloski
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 02:11:02 +0000