summaryrefslogtreecommitdiff
path: root/rel/overlay/share
AgeCommit message (Collapse)Author
2012-11-15Backport new /_active_tasks APIRobert Newson
Improved _active_tasks API Tasks are now free to set any properties they wish (as an Erlang proplist). Different tasks can have different properties and the status string doesn't exist anymore - instead client applications can build it using more granular properties from _active_tasks. Some of these properties are: 1) "progress" (an integer percentage, for all tasks) 2) "database" (for compactions and indexer tasks) 3) "design_document" (for indexer and view compaction tasks) 4) "source" and "target" (for replications) 5) "docs_read", "docs_written", "doc_write_failures", "missing_revs_found", "missing_revs_checked", "source_seq", "checkpointed_source_seq" and "continuous" for replications BugzID: 14269 Conflicts: apps/couch/src/couch_db_updater.erl apps/couch/src/couch_rep.erl apps/couch/src/couch_task_status.erl apps/couch/src/couch_view_compactor.erl apps/couch/src/couch_view_updater.erl
2011-10-04Merge pull request #67 from cloudant/12645-merge_latest_1.1.xAdam Kocoloski
2011-10-04Merge remote branch 'apache/1.1.x'Adam Kocoloski
2011-09-28permit . within database names to allow shard browsing on :5986Robert Newson
2011-09-28handle bigcouch sequences in futon.browse.jsRobert Newson
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-08-12include new share/www files missed in the 1.1 merge.Robert Newson
2011-06-13Merge CouchDB 1.1Robert 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
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-26move futon to share/wwwAdam Kocoloski