New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Bjs/merge/2.2 onto develop #900
Conversation
Pick up fixes: Remove index reformatting Add release notes from 2.1/2.2 line Update node_package to 4.0.1 and update script to use alias for NODETOOL Add support for locked-deps
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1
@@ -2,7 +2,7 @@ | |||
%% ex: ft=erlang ts=4 sw=4 et | |||
{sys, [ | |||
{lib_dirs, ["../deps", "../deps/riak_search/apps"]}, | |||
{rel, "riak", "2.0.5", | |||
{rel, "riak", "2.2.0", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
2.3.0?
@@ -117,8 +118,11 @@ | |||
{template, "../deps/riak_kv/priv/multi_backend.schema", "lib/20-multi_backend.schema"}, | |||
{template, "../deps/eleveldb/priv/eleveldb.schema", "lib/21-leveldb.schema"}, | |||
{template, "../deps/eleveldb/priv/eleveldb_multi.schema", "lib/22-leveldb_multi.schema"}, | |||
{template, "../deps/riak_search/priv/riak_search.schema", "lib/29-riak_search.schema"}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need to make sure we remove this when we PR the removal of riak_search from the riak repo.
@@ -14,7 +14,7 @@ | |||
{web_ip, "127.0.0.1"}. | |||
{web_port, 8098}. | |||
{handoff_port, 8099}. | |||
{handoff_ip, "127.0.0.1"}. | |||
{handoff_ip, "0.0.0.0"}. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Definitely thumbs up to this
+1 |
Pick up fixes:
Remove index reformatting
Add release notes from 2.1/2.2 line
Update node_package to 4.0.1 and update script to use alias for NODETOOL
Add support for locked-deps