Merge branch 'develop'

.gitignore

@@ -13,3 +13,4 @@ ebin/*
 test-unchanged.escript
 .idea
 *.iml
+*.dump

.gitmodules

@@ -2,3 +2,6 @@
 	path = doc
 	url = https://github.com/basho/riak-erlang-client.git
 	branch = gh-pages
+[submodule "tools"]
+	path = tools
+	url = https://github.com/basho/riak-client-tools.git

.travis.yml

@@ -1,8 +1,18 @@
+sudo: required
+dist: trusty
 language: erlang
-notifications:
-  webhooks: http://basho-engbot.herokuapp.com/travis?key=8f07584549e458d4c83728f3397ecbd4368e60a8
-  email: eng@basho.com
 otp_release:
+  - 19.1
   - 18.3
   - 17.5
   - R16B03
+  - R15B03
+env:
+  - RIAK_DOWNLOAD_URL=http://s3.amazonaws.com/downloads.basho.com/riak/2.0/2.0.7/ubuntu/trusty/riak_2.0.7-1_amd64.deb
+  - RIAK_DOWNLOAD_URL=http://s3.amazonaws.com/downloads.basho.com/riak/2.1/2.1.4/ubuntu/trusty/riak_2.1.4-1_amd64.deb
+before_script:
+  - sudo ./tools/travis-ci/riak-install -d "$RIAK_DOWNLOAD_URL"
+  - sudo ./tools/setup-riak
+notifications:
+  slack:
+    secure: JVsrhRuWRTQauP7OjSc1XO6+P3eiOZtkjYhU2R53Hn9dK1KmJRBR5MzO1nq6BUs+bViXiAyW0YOoDTWF0eUw5gdd6sqnvx0+mYJVfYDTfbjp46yqj03Nj+J5HZ1KWPM78NSZ8jpZvdwk35ZpHqhsh/zWOY2RYmIVQKLB9EthHLU=

Makefile

@@ -1,7 +1,9 @@
-.PHONY: all clean compile deps distclean release docs
+.PHONY: all lint clean compile deps distclean release docs
 
 all: deps compile
 
+lint: xref dialyzer
+
 compile: deps
 	./rebar compile
 
@@ -24,10 +26,10 @@ endif
 	@echo "==> Tagging version $(VERSION)"
 	# NB: Erlang client version strings do NOT start with 'v'. Le Sigh.
 	# validate VERSION and allow pre-releases
-	@bash ./build/publish $(VERSION) validate
+	@./tools/build/publish $(VERSION) master validate
 	@git tag --sign -a "$(VERSION)" -m "riak-erlang-client $(VERSION)" --local-user "$(RELEASE_GPG_KEYNAME)"
 	@git push --tags
-	@bash ./build/publish $(VERSION)
+	@./tools/build/publish $(VERSION) master 'Riak Erlang Client' 'riak-erlang-client'
 
 
 DIALYZER_APPS = kernel stdlib sasl erts eunit ssl tools crypto \

README.md

@@ -6,6 +6,7 @@ Build Status
 ============
 
 * Master: [![Build Status](https://travis-ci.org/basho/riak-erlang-client.svg?branch=master)](https://travis-ci.org/basho/riak-erlang-client)
+* Develop: [![Build Status](https://travis-ci.org/basho/riak-erlang-client.svg?branch=develop)](https://travis-ci.org/basho/riak-erlang-client)
 
 
 This document assumes that you have already started your Riak cluster.  For instructions on that prerequisite, refer to [Installation and Setup](https://wiki.basho.com/Installation-and-Setup.html) in the [Riak Wiki](https://wiki.basho.com). You can also view the Riak Erlang Client EDocs [here](http://basho.github.com/riak-erlang-client/).
@@ -260,7 +261,7 @@ Note that keylist updates are asynchronous to the object storage primitives, and
     4> receive Msg2 \-> Msg2 end.
     {87009603,done}
 
-See [`riakc_pb_socket:wait_for_listkeys`](https://github.com/basho/riak-erlang-client/blob/master/src/riakc_pb_socket.erl#L1087) for an example of receiving.
+See [`riakc_utils:wait_for_list`](https://github.com/basho/riak-erlang-client/blob/develop/src/riakc_utils.erl) for a function to receive data.
 
 Bucket Properties
 =================
@@ -664,12 +665,12 @@ CREATE TABLE GeoCheckin
 
 ### Store TS Data
 
-To write data to your table, put the data in a list, and use the `riakc_ts:put/3` function.  Please ensure the the order of the data is the same as the table definition.
+To write data to your table, put the data in a list, and use the `riakc_ts:put/3` function.  Please ensure the the order of the data is the same as the table definition, and note that each row is a tuple of values corresponding to the columns in the table.
 
 
 ```erlang
 {ok, Pid} = riakc_pb_socket:start_link("myriakdb.host", 10017).
-riakc_ts:put(Pid, "GeoCheckin", [[<<"family1">>, <<"series1">>, 1234567, <<"hot">>, 23.5], [<<"family2">>, <<"series99">>, 1234567, <<"windy">>, 19.8]]).
+riakc_ts:put(Pid, "GeoCheckin", [{<<"family1">>, <<"series1">>, 1234567, <<"hot">>, 23.5}, {<<"family2">>, <<"series99">>, 1234567, <<"windy">>, 19.8}]).
 ```
 
 ### Query TS Data
@@ -736,6 +737,7 @@ This is not a comprehensive list, please see the commit history.
 * [Kelly McLaughlin](https://github.com/kellymclaughlin)
 * [Kevin Smith](https://github.com/kevsmith)
 * [Luc Perkins](https://github.com/lucperkins)
+* [Luca Favatella](https://github.com/lucafavatella)
 * [Lukasz Milewski](https://github.com/milek)
 * [Luke Bakken](https://github.com/lukebakken)
 * [Mark Phillips](https://github.com/phips)

RELNOTES.md

@@ -1,10 +1,12 @@
 Release Notes
 =============
 
-* [2.4.1](https://github.com/basho/riak-erlang-client/issues?q=milestone%3Ariak-erlang-client-2.4.1)
+* [`2.5.0`](https://github.com/basho/riak-erlang-client/issues?q=milestone%3Ariak-erlang-client-2.5.0)
+ * Adds HyperLogLog CRDT data type support
+* [`2.4.1`](https://github.com/basho/riak-erlang-client/issues?q=milestone%3Ariak-erlang-client-2.4.1)
  * OTP 19 support via updated dependencies and a few platform defines
-* [2.4.0](https://github.com/basho/riak-erlang-client/issues?q=milestone%3Ariak-erlang-client-2.4.0)
+* [`2.4.0`](https://github.com/basho/riak-erlang-client/issues?q=milestone%3Ariak-erlang-client-2.4.0)
  * This release merges in the Riak timeseries code base from the `2.3.1-timeseries` and `2.3.2-timeseries` releases.
-* [2.1.2](https://github.com/basho/riak-erlang-client/issues?q=milestone%3Ariak-erlang-client-2.1.2)
+* [`2.1.2`](https://github.com/basho/riak-erlang-client/issues?q=milestone%3Ariak-erlang-client-2.1.2)
  * OTP 18 support
  * Fix processing of response from Riak when Riak generates an object's key [PR](https://github.com/basho/riak-erlang-client/pull/289)

rebar.config

@@ -13,7 +13,7 @@
 ]}.
 
 {deps, [
-    {riak_pb, ".*", {git, "git://github.com/basho/riak_pb", {branch, "develop-2.2"}}}
+    {riak_pb, ".*", {git, "https://github.com/basho/riak_pb", {tag, "2.2.0.0"}}}
 ]}.
 
 {edoc_opts, [

src/riakc_map.erl

@@ -155,6 +155,8 @@ erase(Key, #map{removes=R}=M) ->
 %% it will be initialized to the empty value for its type before being
 %% passed to the function.
 -spec update(key(), update_fun(), crdt_map()) -> crdt_map().
+update({_Name, hll}, _Fun, _M) ->
+    erlang:error(badarg, ["maps may not contain hll datatype"]);
 update(Key, Fun, #map{updates=U}=M) ->
     %% In order, search for key in 1) batched updates, then 2) values
     %% taken from Riak, and otherwise 3) create a new, empty data type