You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/08/10 22:04:21 UTC
[1/2] couchdb commit: updated refs/heads/windsor-merge to 681b993
Repository: couchdb
Updated Branches:
refs/heads/windsor-merge 497cd1f0c -> 681b993f2
Reformat rebar.config.script
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d07a11d3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d07a11d3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d07a11d3
Branch: refs/heads/windsor-merge
Commit: d07a11d349b0920ca3d7bd8fa2df4ac3c9b4e938
Parents: 497cd1f
Author: Paul J. Davis <pa...@gmail.com>
Authored: Thu Aug 7 11:21:06 2014 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Sun Aug 10 15:03:52 2014 -0500
----------------------------------------------------------------------
rebar.config.script | 64 ++++++++++++++++++++++++++----------------------
1 file changed, 35 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/d07a11d3/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 3203d05..456df6e 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -17,37 +17,43 @@ os:putenv("COUCHDB_CONFIG", ConfigureEnv).
DepDescs = [
- {cassim, "couchdb-cassim", {branch, "windsor-merge"}, []},
- {couch_log, "couchdb-couch-log", {branch, "master"}, []},
- {config, "couchdb-config", {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, "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, "windsor-merge"}, []},
- {mochiweb, "couchdb-mochiweb", {branch, "master"}, []},
- {oauth, "couchdb-oauth", {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]}
+ {b64url, "b64url", {branch, "windsor-merge"}},
+ {cassim, "cassim", {branch, "windsor-merge"}},
+ {couch_log, "couch-log", {branch, "master"}},
+ {config, "config", {branch, "master"}},
+ {chttpd, "chttpd", {branch, "windsor-merge"}},
+ {couch, "couch", {branch, "windsor-merge"}},
+ {couch_index, "couch-index", {branch, "windsor-merge"}},
+ {couch_mrview, "couch-mrview", {branch, "windsor-merge"}},
+ {couch_replicator, "couch-replicator", {branch, "windsor-merge"}},
+ {couch_dbupdates, "couch-dbupdates", {branch, "master"}},
+ {couch_plugins, "couch-plugins", {branch, "master"}},
+ {couch_event, "couch-event", {branch, "windsor-merge"}},
+ {docs, "documentation", {branch, "master"}, [raw]},
+ {ddoc_cache, "ddoc-cache", {branch, "windsor-merge"}},
+ {ets_lru, "ets-lru", {branch, "windsor-merge"}},
+ {fabric, "fabric", {branch, "windsor-merge"}},
+ {fauxton, "fauxton", {branch, "master"}, [raw]},
+ {global_changes, "global-changes", {branch, "windsor-merge"}},
+ {ibrowse, "ibrowse", {branch, "master"}},
+ {jiffy, "jiffy", {branch, "master"}},
+ {khash, "khash", {branch, "windsor-merge"}},
+ {mem3, "mem3", {branch, "windsor-merge"}},
+ {mochiweb, "mochiweb", {branch, "master"}},
+ {oauth, "oauth", {branch, "master"}},
+ {rexi, "rexi", {branch, "windsor-merge"}},
+ {snappy, "snappy", {branch, "1994-merge-rcouch"}}
],
-MakeDep = fun({AppName, RepoName, Version, Options}) ->
- Url = "https://git-wip-us.apache.org/repos/asf/" ++ RepoName ++ ".git",
- {AppName, ".*", {git, Url, Version}, Options}
+BaseUrl = "https://git-wip-us.apache.org/repos/asf/",
+
+MakeDep = fun
+ ({AppName, RepoName, Version}) ->
+ Url = BaseUrl ++ "couchdb-" ++ RepoName ++ ".git",
+ {AppName, ".*", {git, Url, Version}};
+ ({AppName, RepoName, Version, Options}) ->
+ Url = BaseUrl ++ "couchdb-" ++ RepoName ++ ".git",
+ {AppName, ".*", {git, Url, Version}, Options}
end,
AddConfig = [
[2/2] couchdb commit: updated refs/heads/windsor-merge to 681b993
Posted by da...@apache.org.
Remove couch_replicator_manager as its in the OTP hierarchy now.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/681b993f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/681b993f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/681b993f
Branch: refs/heads/windsor-merge
Commit: 681b993f291347397d4049592a106591bd642ee2
Parents: d07a11d
Author: Paul J. Davis <pa...@gmail.com>
Authored: Thu Aug 7 13:16:50 2014 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Sun Aug 10 15:03:53 2014 -0500
----------------------------------------------------------------------
rel/overlay/etc/default.ini | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/681b993f/rel/overlay/etc/default.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index dfcd3bc..9d69029 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -158,7 +158,6 @@ stats_aggregator={couch_stats_aggregator, start, []}
stats_collector={couch_stats_collector, start, []}
uuids={couch_uuids, start, []}
auth_cache={couch_auth_cache, start_link, []}
-replicator_manager={couch_replicator_manager, start_link, []}
os_daemons={couch_os_daemons, start_link, []}
compaction_daemon={couch_compaction_daemon, start_link, []}