From b8ad66bbb87e8056f9c96e24e56ecd52744fc67f Mon Sep 17 00:00:00 2001 From: Mikhail Kalashnikov Date: Thu, 10 Nov 2016 12:05:21 +0300 Subject: [PATCH 1/2] Fix compilation. Add sext, riak_dt to app.src --- src/nkbase.app.src | 2 +- src/nkbase_ensemble.erl | 2 +- src/nkbase_ensemble_admin.erl | 2 +- src/nkbase_ensemble_backend.erl | 2 +- src/nkbase_sc.erl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/nkbase.app.src b/src/nkbase.app.src index 7bf9473..1f7faf7 100755 --- a/src/nkbase.app.src +++ b/src/nkbase.app.src @@ -4,7 +4,7 @@ {modules, []}, {registered, []}, {mod, {nkbase_app, []}}, - {applications, [kernel, stdlib, crypto, sasl, lager, nkdist]}, + {applications, [kernel, stdlib, crypto, sasl, lager, nkdist, sext, riak_dt]}, {env, [ {expire_resolution, 1000}, % Expiration timers resolution (msecs) {expire_check, 60}, % Time to check for long expires (secs) diff --git a/src/nkbase_ensemble.erl b/src/nkbase_ensemble.erl index 6d20aed..0ce3339 100644 --- a/src/nkbase_ensemble.erl +++ b/src/nkbase_ensemble.erl @@ -30,7 +30,7 @@ -export([start_link/0]). -include("nkbase.hrl"). --include_lib("riak_ensemble/include/riak_ensemble_types.hrl"). +-include_lib("riak_ensemble_ng/include/riak_ensemble_types.hrl"). %% =================================================================== diff --git a/src/nkbase_ensemble_admin.erl b/src/nkbase_ensemble_admin.erl index 78d1c8b..21b1514 100644 --- a/src/nkbase_ensemble_admin.erl +++ b/src/nkbase_ensemble_admin.erl @@ -27,7 +27,7 @@ -export([ensemble_overview/0, ensemble_detail/1]). -compile(export_all). --include_lib("riak_ensemble/include/riak_ensemble_types.hrl"). +-include_lib("riak_ensemble_ng/include/riak_ensemble_types.hrl"). -type ensembles() :: [{ensemble_id(), ensemble_info()}]. diff --git a/src/nkbase_ensemble_backend.erl b/src/nkbase_ensemble_backend.erl index 52cea49..f08ee8d 100644 --- a/src/nkbase_ensemble_backend.erl +++ b/src/nkbase_ensemble_backend.erl @@ -31,7 +31,7 @@ -export([synctree_path/2]). -export([handle_down/4]). --include_lib("riak_ensemble/include/riak_ensemble_types.hrl"). +-include_lib("riak_ensemble_ng/include/riak_ensemble_types.hrl"). -record(state, { ensemble :: ensemble_id(), diff --git a/src/nkbase_sc.erl b/src/nkbase_sc.erl index 8b569c6..e7492a1 100644 --- a/src/nkbase_sc.erl +++ b/src/nkbase_sc.erl @@ -33,7 +33,7 @@ -export_type([eseq/0, kget_meta/0, kput_meta/0]). -include("nkbase.hrl"). --include_lib("riak_ensemble/include/riak_ensemble_types.hrl"). +-include_lib("riak_ensemble_ng/include/riak_ensemble_types.hrl"). %% =================================================================== From 0102fd8f9284632d33b0c76c1630c8f337f2f35e Mon Sep 17 00:00:00 2001 From: Mikhail Kalashnikov Date: Wed, 14 Dec 2016 17:29:54 +0300 Subject: [PATCH 2/2] change riak_ensemble_ng back, since it fixed in riak_core_ng pkg --- src/nkbase_ensemble.erl | 2 +- src/nkbase_ensemble_admin.erl | 2 +- src/nkbase_ensemble_backend.erl | 2 +- src/nkbase_sc.erl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/nkbase_ensemble.erl b/src/nkbase_ensemble.erl index 0ce3339..6d20aed 100644 --- a/src/nkbase_ensemble.erl +++ b/src/nkbase_ensemble.erl @@ -30,7 +30,7 @@ -export([start_link/0]). -include("nkbase.hrl"). --include_lib("riak_ensemble_ng/include/riak_ensemble_types.hrl"). +-include_lib("riak_ensemble/include/riak_ensemble_types.hrl"). %% =================================================================== diff --git a/src/nkbase_ensemble_admin.erl b/src/nkbase_ensemble_admin.erl index 21b1514..78d1c8b 100644 --- a/src/nkbase_ensemble_admin.erl +++ b/src/nkbase_ensemble_admin.erl @@ -27,7 +27,7 @@ -export([ensemble_overview/0, ensemble_detail/1]). -compile(export_all). --include_lib("riak_ensemble_ng/include/riak_ensemble_types.hrl"). +-include_lib("riak_ensemble/include/riak_ensemble_types.hrl"). -type ensembles() :: [{ensemble_id(), ensemble_info()}]. diff --git a/src/nkbase_ensemble_backend.erl b/src/nkbase_ensemble_backend.erl index f08ee8d..52cea49 100644 --- a/src/nkbase_ensemble_backend.erl +++ b/src/nkbase_ensemble_backend.erl @@ -31,7 +31,7 @@ -export([synctree_path/2]). -export([handle_down/4]). --include_lib("riak_ensemble_ng/include/riak_ensemble_types.hrl"). +-include_lib("riak_ensemble/include/riak_ensemble_types.hrl"). -record(state, { ensemble :: ensemble_id(), diff --git a/src/nkbase_sc.erl b/src/nkbase_sc.erl index e7492a1..8b569c6 100644 --- a/src/nkbase_sc.erl +++ b/src/nkbase_sc.erl @@ -33,7 +33,7 @@ -export_type([eseq/0, kget_meta/0, kput_meta/0]). -include("nkbase.hrl"). --include_lib("riak_ensemble_ng/include/riak_ensemble_types.hrl"). +-include_lib("riak_ensemble/include/riak_ensemble_types.hrl"). %% ===================================================================