Skip to content

Commit

Permalink
Merge branch '2.0' into develop-2.0-merge
Browse files Browse the repository at this point in the history 
Conflicts:
	rebar.config
  • Loading branch information
@cmeiklejohn
cmeiklejohn committed Feb 13, 2015
2 parents c93682a + 10fcb78 commit 5bcb7ac
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/eleveldb.erl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,10 @@ async_write(_CallerRef, _Ref, _Updates, _Opts) ->
erlang:nif_error({error, not_loaded}).

-spec async_iterator(reference(), db_ref(), read_options()) -> ok.
-spec async_iterator(reference(), db_ref(), read_options(), keys_only) -> ok.
async_iterator(_CallerRef, _Ref, _Opts) ->
erlang:nif_error({error, not_loaded}).

-spec async_iterator(reference(), db_ref(), read_options(), keys_only) -> ok.
async_iterator(_CallerRef, _Ref, _Opts, keys_only) ->
erlang:nif_error({error, not_loaded}).

Expand Down

5 comments on commit 5bcb7ac

@borshop
Copy link
Contributor

Choose a reason for hiding this comment

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

saw approval from aberghage
at 5bcb7ac

@borshop
Copy link
Contributor

Choose a reason for hiding this comment

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

merging basho/eleveldb/develop-2.0-merge = 5bcb7ac into borshop-integration-133-develop-2.0-merge

@borshop
Copy link
Contributor

Choose a reason for hiding this comment

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

basho/eleveldb/develop-2.0-merge = 5bcb7ac merged ok, testing candidate = a5b5148

@borshop
Copy link
Contributor

Choose a reason for hiding this comment

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

all tests pass:
success: http://buildbot.bos1/builders/test-eleveldb/builds/352

@borshop
Copy link
Contributor

Choose a reason for hiding this comment

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

fast-forwarding develop to borshop-integration-133-develop-2.0-merge = a5b5148

Please sign in to comment.