Merge pull request #395 from basho/develop-3.0-292

Develop 3.0 292
basho · May 7, 2020 · 980ba8f · 980ba8f
2 parents 1bc4e86 + c01eea0
commit 980ba8f
Show file tree

Hide file tree

Showing 8 changed files with 845 additions and 41 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ test-unchanged.escript
 *.dump
 _build/
 rebar.lock
+.DS_Store
diff --git a/.travis.yml b/.travis.yml
@@ -1,18 +1,8 @@
-sudo: required
-dist: trusty
 language: erlang
 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=
+  - 20.3.8
+  - 21.3
+  - 22.3
+script:
+  - chmod u+x rebar3
+  - ./rebar3 do upgrade, compile, xref, dialyzer, eunit
diff --git a/include/riakc.hrl b/include/riakc.hrl
@@ -32,7 +32,8 @@
                           auto_reconnect |
                           {auto_reconnect, boolean()} |
                           keepalive |
-                          {keepalive, boolean()}.
+                          {keepalive, boolean()}|
+                          {silence_terminate_crash, boolean()}.
 %% Options for starting or modifying the connection:
 %% `queue_if_disconnected' when present or true will cause requests to
 %% be queued while the connection is down. `auto_reconnect' when

diff --git a/rebar b/rebar
diff --git a/rebar.config b/rebar.config
@@ -1,4 +1,4 @@
-{require_otp_vsn, "R15|R16|17|18|19|20|21"}.
+{require_otp_vsn, "20|21|22"}.
 
 {cover_enabled, true}.
 

diff --git a/rebar.config.script b/rebar.config.script
diff --git a/rebar3 b/rebar3
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,3 +15,4 @@ test-unchanged.escript @@
     *.dump
     _build/
     rebar.lock
+    .DS_Store