add gsets support#229
Merged
Merged
Conversation
This was referenced Mar 1, 2018
ghost
approved these changes
Mar 12, 2018
ghost
left a comment
There was a problem hiding this comment.
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 ?
|
@martincox - one for merging. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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