Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

add gsets support #229

Merged
merged 1 commit into from
Mar 22, 2018
Merged

add gsets support #229

merged 1 commit into from
Mar 22, 2018

Conversation

russelldb
Copy link
Member

This is the same as branch rdb/bet365/gsets which was already merged to basho/riak_pb develop after full review and testing. The difference here is that it is pointed at develop-2.2, and it has been rebased to bring it down to one commit

basho/riak_kv#1665
basho/riak_test#1302

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merges cleanly into develop-2.2 and tests pass.
On develop-2.2.5 produces the following error:

⚛︎□▷  make ; make test
==> riak_pb (get-deps)
Pulling protobuffs from {git,"https://github.com/basho/erlang_protobuffs.git",
                             {branch,"develop-2.2.5"}}
Cloning into 'protobuffs'...
error: pathspec 'origin/develop-2.2.5' did not match any file(s) known to git.
ERROR: sh(git checkout -q origin/develop-2.2.5)
failed with return code 1 and the following output:
error: pathspec 'origin/develop-2.2.5' did not match any file(s) known to git.

ERROR: 'get-deps' failed while processing /Users/bryanhunt/riak_pb: rebar_abort
make: *** [erl_deps] Error 1
WARN:  Directory expected to be an app dir, but no app file found 
in ebin/ or src/:
/Users/bryanhunt/riak_pb/deps/protobuffs
==> riak_pb (pre_compile)
==> riak_pb (compile)
WARN:  Directory expected to be an app dir, but no app file found 
in ebin/ or src/:
/Users/bryanhunt/riak_pb/deps/protobuffs
Dependency not available: protobuffs-0.9.* ({git,
                                             "https://github.com/basho/erlang_protobuffs.git",
                                             {branch,"develop-2.2.5"}})
Dependency not available: hamcrest-0.3.* ({git,
                                           "https://github.com/basho/hamcrest-erlang.git",
                                           {tag,"0.3.0-basho"}})
ERROR: compile failed while processing /Users/bryanhunt/riak_pb: rebar_abort
make: *** [erl_compile] Error 1

Shouldn't be an issue though, we're going for develop-2.2, right ?

@ghost
Copy link

ghost commented Mar 12, 2018

@martincox - one for merging.

@russelldb russelldb merged commit 3f65a02 into basho:develop-2.2 Mar 22, 2018
@russelldb russelldb deleted the gsets branch March 22, 2018 15:56
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant