summaryrefslogtreecommitdiff
path: root/couchjs
AgeCommit message (Collapse)Author
2011-10-10Remove call to subprocess.check_outputPaul J. Davis
This function is new in Python 2.7 and we already have a function that returns command ouput. Just reuse runcmd to get the version.
2011-10-10Merge remote-tracking branch 'apache/1.1.x'Robert 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-09-22Updated CouchJS to support SpiderMonkey 1.8.5Paul J. Davis
This is tested against the 1.7.0, 1.8.0rc1, and 1.8.5 tarballs from Mozilla's FTP directory. It's mostly the same code from trunk minus a few tweaks to get it past a couple type errors using c++ instead of cc.
2011-06-13Merge CouchDB 1.1Robert Newson
2011-04-29make pkg-config modifications conditional on successful status code.Robert Newson
2011-04-25use pkg-config, if present, to find spidermonkey.Robert Newson
2011-04-08add Solaris build support.Robert Newson
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-01freebsd compatbenoitc
2010-10-23remove inadvertent commitAdam Kocoloski
2010-10-23b25b5b was sloppy, erlang:send_after/3 does not wrap w/ okAdam Kocoloski
2010-08-27Apache 2 license, Cloudant copyright when appropriateAdam Kocoloski
2010-08-23consolidate all couchjs stuff in one subdirAdam Kocoloski