inital move to rebar compilation - move src/apps - download dependencies using rebar - replace ejson by jiffy - replace couch_drv & couch_ejson_compare by couch_collate
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/commit/05cdb348 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/05cdb348 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/05cdb348 Branch: refs/heads/1994-merge-rcouch Commit: 05cdb348bb715d89b633d73e27ad1eba8efd63c7 Parents: b58ffb9 Author: benoitc <[email protected]> Authored: Mon Jan 6 21:12:45 2014 +0100 Committer: Paul J. Davis <[email protected]> Committed: Wed Feb 12 18:16:57 2014 -0600 ---------------------------------------------------------------------- src/couch_replicator.erl | 2 +- src/couch_replicator_api_wrap.erl | 2 +- src/couch_replicator_httpc.erl | 4 ++-- src/couch_replicator_httpc_pool.erl | 2 +- src/couch_replicator_httpd.erl | 2 +- src/couch_replicator_job_sup.erl | 2 +- src/couch_replicator_manager.erl | 2 +- src/couch_replicator_notifier.erl | 2 +- src/couch_replicator_utils.erl | 4 ++-- src/couch_replicator_worker.erl | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/05cdb348/src/couch_replicator.erl ---------------------------------------------------------------------- diff --git a/src/couch_replicator.erl b/src/couch_replicator.erl index 91039b6..d470c8a 100644 --- a/src/couch_replicator.erl +++ b/src/couch_replicator.erl @@ -24,7 +24,7 @@ -export([init/1, terminate/2, code_change/3]). -export([handle_call/3, handle_cast/2, handle_info/2]). --include("couch_db.hrl"). +-include_lib("couch/include/couch_db.hrl"). -include("couch_replicator_api_wrap.hrl"). -include("couch_replicator.hrl"). http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/05cdb348/src/couch_replicator_api_wrap.erl ---------------------------------------------------------------------- diff --git a/src/couch_replicator_api_wrap.erl b/src/couch_replicator_api_wrap.erl index 52e15b7..311025b 100644 --- a/src/couch_replicator_api_wrap.erl +++ b/src/couch_replicator_api_wrap.erl @@ -18,7 +18,7 @@ % Notes: % Many options and apis aren't yet supported here, they are added as needed. --include("couch_db.hrl"). +-include_lib("couch/include/couch_db.hrl"). -include("couch_replicator_api_wrap.hrl"). -export([ http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/05cdb348/src/couch_replicator_httpc.erl ---------------------------------------------------------------------- diff --git a/src/couch_replicator_httpc.erl b/src/couch_replicator_httpc.erl index b8fb31b..c13bf18 100644 --- a/src/couch_replicator_httpc.erl +++ b/src/couch_replicator_httpc.erl @@ -12,9 +12,9 @@ -module(couch_replicator_httpc). --include("couch_db.hrl"). +-include_lib("couch/include/couch_db.hrl"). -include("couch_replicator_api_wrap.hrl"). --include("../ibrowse/ibrowse.hrl"). +-include_lib("ibrowse/include/ibrowse.hrl"). -export([setup/1]). -export([send_req/3]). http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/05cdb348/src/couch_replicator_httpc_pool.erl ---------------------------------------------------------------------- diff --git a/src/couch_replicator_httpc_pool.erl b/src/couch_replicator_httpc_pool.erl index b065b7c..a82a2df 100644 --- a/src/couch_replicator_httpc_pool.erl +++ b/src/couch_replicator_httpc_pool.erl @@ -21,7 +21,7 @@ -export([init/1, handle_call/3, handle_info/2, handle_cast/2]). -export([code_change/3, terminate/2]). --include("couch_db.hrl"). +-include_lib("couch/include/couch_db.hrl"). -import(couch_util, [ get_value/2, http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/05cdb348/src/couch_replicator_httpd.erl ---------------------------------------------------------------------- diff --git a/src/couch_replicator_httpd.erl b/src/couch_replicator_httpd.erl index c0fe004..0a21d52 100644 --- a/src/couch_replicator_httpd.erl +++ b/src/couch_replicator_httpd.erl @@ -12,7 +12,7 @@ -module(couch_replicator_httpd). --include("couch_db.hrl"). +-include_lib("couch/include/couch_db.hrl"). -import(couch_httpd, [ send_json/2, http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/05cdb348/src/couch_replicator_job_sup.erl ---------------------------------------------------------------------- diff --git a/src/couch_replicator_job_sup.erl b/src/couch_replicator_job_sup.erl index e8a7b96..484cc1a 100644 --- a/src/couch_replicator_job_sup.erl +++ b/src/couch_replicator_job_sup.erl @@ -14,7 +14,7 @@ -behaviour(supervisor). -export([init/1, start_link/0]). --include("couch_db.hrl"). +-include_lib("couch/include/couch_db.hrl"). start_link() -> supervisor:start_link({local,?MODULE}, ?MODULE, []). http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/05cdb348/src/couch_replicator_manager.erl ---------------------------------------------------------------------- diff --git a/src/couch_replicator_manager.erl b/src/couch_replicator_manager.erl index 4891c4c..8055727 100644 --- a/src/couch_replicator_manager.erl +++ b/src/couch_replicator_manager.erl @@ -22,7 +22,7 @@ -export([start_link/0, init/1, handle_call/3, handle_info/2, handle_cast/2]). -export([code_change/3, terminate/2]). --include("couch_db.hrl"). +-include_lib("couch/include/couch_db.hrl"). -include("couch_replicator.hrl"). -include("couch_replicator_js_functions.hrl"). http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/05cdb348/src/couch_replicator_notifier.erl ---------------------------------------------------------------------- diff --git a/src/couch_replicator_notifier.erl b/src/couch_replicator_notifier.erl index 3b48b71..39fd68b 100644 --- a/src/couch_replicator_notifier.erl +++ b/src/couch_replicator_notifier.erl @@ -21,7 +21,7 @@ -export([init/1, terminate/2, code_change/3]). -export([handle_event/2, handle_call/2, handle_info/2]). --include("couch_db.hrl"). +-include_lib("couch/include/couch_db.hrl"). start_link(FunAcc) -> couch_event_sup:start_link(couch_replication, http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/05cdb348/src/couch_replicator_utils.erl ---------------------------------------------------------------------- diff --git a/src/couch_replicator_utils.erl b/src/couch_replicator_utils.erl index 240d7d4..0baddc2 100644 --- a/src/couch_replicator_utils.erl +++ b/src/couch_replicator_utils.erl @@ -18,10 +18,10 @@ -export([replication_id/2]). -export([sum_stats/2]). --include("couch_db.hrl"). +-include_lib("couch/include/couch_db.hrl"). -include("couch_replicator_api_wrap.hrl"). -include("couch_replicator.hrl"). --include("../ibrowse/ibrowse.hrl"). +-include_lib("ibrowse/include/ibrowse.hrl"). -import(couch_util, [ get_value/2, http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/05cdb348/src/couch_replicator_worker.erl ---------------------------------------------------------------------- diff --git a/src/couch_replicator_worker.erl b/src/couch_replicator_worker.erl index d66d478..0f65900 100644 --- a/src/couch_replicator_worker.erl +++ b/src/couch_replicator_worker.erl @@ -20,7 +20,7 @@ -export([init/1, terminate/2, code_change/3]). -export([handle_call/3, handle_cast/2, handle_info/2]). --include("couch_db.hrl"). +-include_lib("couch/include/couch_db.hrl"). -include("couch_replicator_api_wrap.hrl"). -include("couch_replicator.hrl").
