You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2014/08/07 20:58:42 UTC
[1/2] couchdb commit: updated refs/heads/windsor-merge to 497cd1f
Repository: couchdb
Updated Branches:
refs/heads/windsor-merge b667060b6 -> 497cd1f0c (forced update)
Test all windsor-merge branches
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/79d26312
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/79d26312
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/79d26312
Branch: refs/heads/windsor-merge
Commit: 79d26312c2cfb3622b4a607ee05e866423b9e673
Parents: 91294eb
Author: Robert Newson <rn...@apache.org>
Authored: Thu Aug 7 16:41:51 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Thu Aug 7 19:58:01 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/79d26312/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index afe0b0f..3203d05 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -20,26 +20,27 @@ DepDescs = [
{cassim, "couchdb-cassim", {branch, "windsor-merge"}, []},
{couch_log, "couchdb-couch-log", {branch, "master"}, []},
{config, "couchdb-config", {branch, "master"}, []},
- {chttpd, "couchdb-chttpd", {branch, "master"}, []},
- {couch, "couchdb-couch", {branch, "master"}, []},
- {couch_index, "couchdb-couch-index", {branch, "master"}, []},
- {couch_mrview, "couchdb-couch-mrview", {branch, "master"}, []},
- {couch_replicator, "couchdb-couch-replicator", {branch, "master"}, []},
+ {chttpd, "couchdb-chttpd", {branch, "windsor-merge"}, []},
+ {couch, "couchdb-couch", {branch, "windsor-merge"}, []},
+ {couch_index, "couchdb-couch-index", {branch, "windsor-merge"}, []},
+ {couch_mrview, "couchdb-couch-mrview", {branch, "windsor-merge"}, []},
+ {couch_replicator, "couchdb-couch-replicator", {branch, "windsor-merge"}, []},
{couch_dbupdates, "couchdb-couch-dbupdates", {branch, "master"}, []},
{couch_plugins, "couchdb-couch-plugins", {branch, "master"}, []},
{couch_event, "couchdb-couch-event", {branch, "windsor-merge"}, []},
- {ddoc_cache, "couchdb-ddoc-cache", {branch, "master"}, []},
- {ets_lru, "couchdb-ets-lru", {branch, "master"}, []},
- {fabric, "couchdb-fabric", {branch, "master"}, []},
+ {ddoc_cache, "couchdb-ddoc-cache", {branch, "windsor-merge"}, []},
+ {ets_lru, "couchdb-ets-lru", {branch, "windsor-merge"}, []},
+ {fabric, "couchdb-fabric", {branch, "windsor-merge"}, []},
{ibrowse, "couchdb-ibrowse", {tag, "master"}, []},
{jiffy, "couchdb-jiffy", {branch, "master"}, []},
{khash, "couchdb-khash", {branch, "windsor-merge"}, []},
- {mem3, "couchdb-mem3", {branch, "master"}, []},
+ {mem3, "couchdb-mem3", {branch, "windsor-merge"}, []},
{mochiweb, "couchdb-mochiweb", {branch, "master"}, []},
{oauth, "couchdb-oauth", {branch, "master"}, []},
- {rexi, "couchdb-rexi", {branch, "master"}, []},
+ {rexi, "couchdb-rexi", {branch, "windsor-merge"}, []},
{snappy, "couchdb-snappy", {branch, "1994-merge-rcouch"}, []},
{b64url, "couchdb-b64url", {branch, "windsor-merge"}, []},
+ {global_changes, "couchdb-global-changes", {branch, "windsor-merge"}, []},
{fauxton, "couchdb-fauxton", {branch, "master"}, [raw]},
{docs, "couchdb-documentation", {branch, "master"}, [raw]}
],
[2/2] couchdb commit: updated refs/heads/windsor-merge to 497cd1f
Posted by rn...@apache.org.
Make clean recursive
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/497cd1f0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/497cd1f0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/497cd1f0
Branch: refs/heads/windsor-merge
Commit: 497cd1f0c55d671193e45117f3e288a2acf49622
Parents: 79d2631
Author: Robert Newson <rn...@apache.org>
Authored: Thu Aug 7 19:57:02 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Thu Aug 7 19:58:04 2014 +0100
----------------------------------------------------------------------
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/497cd1f0/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 800b6dd..ed927ba 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ compile: config.erl
clean:
@echo "==> couchjs (clean)"
- @rebar clean
+ @rebar -r clean
check: eunit