couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject chttpd commit: updated refs/heads/master to d06c635
Date Tue, 06 May 2014 16:33:44 GMT
Repository: couchdb-chttpd
Updated Branches:
  refs/heads/master [created] d06c63596


Merge remote-tracking branch 'origin/1993-bigcouch-couch-mrview'

Conflicts:
	src/chttpd_view.erl


Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/d06c6359
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/d06c6359
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/d06c6359

Branch: refs/heads/master
Commit: d06c6359682959cb25bc72443a687a4335da52b6
Parents: 2edc062 793da96
Author: Robert Newson <rnewson@apache.org>
Authored: Tue May 6 17:00:08 2014 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Tue May 6 17:00:08 2014 +0100

----------------------------------------------------------------------
 src/chttpd_db.erl   |  43 ++---
 src/chttpd_misc.erl |  40 +++--
 src/chttpd_show.erl | 103 +-----------
 src/chttpd_view.erl | 425 +++++++----------------------------------------
 4 files changed, 107 insertions(+), 504 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/d06c6359/src/chttpd_misc.erl
----------------------------------------------------------------------


Mime
View raw message