Merge branch 'develop' into sweeper-develop-merge

Conflicts:	rebar.config

Author: nickelization

.gitignore

@@ -1,3 +1,4 @@
+.rebar/
 .eunit/*
 deps/*
 priv/*
@@ -9,3 +10,7 @@ ebin/*
 /.eqc-info
 /current_counterexample.eqc
 .local_dialyzer_plt
+test-unchanged.escript
+.idea
+*.iml
+*.dump

.gitmodules

@@ -0,0 +1,7 @@
+[submodule "doc"]
+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,12 +1,19 @@
+sudo: required
+dist: trusty
 language: erlang
-before_script:
- - export RIAK_TEST_NODE_1=`egrep '^\-s?name' /etc/riak/vm.args | awk '{print $2}'`
- - export RIAK_TEST_COOKIE=`egrep '^-setcookie' /etc/riak/vm.args | awk '{print $2}'`
-notifications:
- webhooks: http://basho-engbot.herokuapp.com/travis?key=8f07584549e458d4c83728f3397ecbd4368e60a8
- email: eng@basho.com
 otp_release:
- - 18.1
+ - 19.1
+ - 18.3
  - 17.5
  - R16B03
- - R16B02
+ - 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.2/2.2.0/ubuntu/trusty/riak_2.2.0-1_amd64.deb
+before_script:
+ - jdk_switcher use oraclejdk8
+ - 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
+.PHONY: all lint clean compile deps distclean release docs
 
 all: deps compile
 
+lint: xref dialyzer
+
 compile: deps
 ./rebar compile
 
@@ -14,6 +16,21 @@ clean:
 distclean: clean
 ./rebar delete-deps
 
+release: compile
+ifeq ($(VERSION),)
+$(error VERSION must be set to build a release and deploy this package)
+endif
+ifeq ($(RELEASE_GPG_KEYNAME),)
+$(error RELEASE_GPG_KEYNAME must be set to build a release and deploy this package)
+endif
+@echo "==> Tagging version $(VERSION)"
+# NB: Erlang client version strings do NOT start with 'v'. Le Sigh.
+# validate VERSION and allow pre-releases
+@./tools/build/publish $(VERSION) master validate
+@git tag --sign -a "$(VERSION)" -m "riak-erlang-client $(VERSION)" --local-user "$(RELEASE_GPG_KEYNAME)"
+@git push --tags
+@./tools/build/publish $(VERSION) master 'Riak Erlang Client' 'riak-erlang-client'
+
 
 DIALYZER_APPS = kernel stdlib sasl erts eunit ssl tools crypto \
  inets public_key syntax_tools compiler

README.md

@@ -0,0 +1,15 @@
+Release Notes
+=============
+
+* [`2.5.1`](https://github.com/basho/riak-erlang-client/issues?q=milestone%3Ariak-erlang-client-2.5.1)
+ * Adds GSet CRDT data type support
+ * Support for Riak TS 1.5
+* [`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)
+ * 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)
+ * 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)