Skip to content

Commit

Permalink
Merge a3863d0 into ae73164
Browse files Browse the repository at this point in the history
  • Loading branch information
albsch committed Jul 30, 2019
2 parents ae73164 + a3863d0 commit a854eed
Show file tree
Hide file tree
Showing 12 changed files with 1 addition and 774 deletions.
2 changes: 1 addition & 1 deletion bin/env
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if [ -z "$PB_PORT" ]; then
export PB_PORT=8087
fi

# Protocol buffer port.
# Protocol buffer ip.
if [ -z "$PB_IP" ]; then
export PB_IP="127.0.0.1"
fi
Expand Down
1 change: 0 additions & 1 deletion rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@
{mkdir, "data/ring"},
{mkdir, "log/sasl"},
{copy, "bin/env", "bin/env"},
{template, "rel/files/antidote-admin", "bin/antidote-admin"},
{template, "_build/default/lib/cuttlefish/priv/erlang_vm.schema", "lib/11-erlang_vm.schema"},
{template, "_build/default/lib/riak_core/priv/riak_core.schema", "lib/12-riak_core.schema"},
{template, "_build/default/lib/riak_sysmon/priv/riak_sysmon.schema", "lib/15-riak_sysmon.schema"},
Expand Down
156 changes: 0 additions & 156 deletions rel/files/antidote

This file was deleted.

Loading

0 comments on commit a854eed

Please sign in to comment.