From 2f0783b2a913b505d0201e0b7a1e55c632022b16 Mon Sep 17 00:00:00 2001
From: Hiroyasu OHYAMA <user.localhost2000@gmail.com>
Date: Mon, 29 Feb 2016 10:56:48 +0000
Subject: [PATCH 1/3] correct the configuration of Travis to cover with all
 Ruby versions that riak-ruby-client supports

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index eb368132..0b84a312 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,8 @@
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1.8
+  - 2.2.4
   - jruby-18mode
   - jruby-19mode
   - jruby-head

From b94099907cc188f03996af2f28d177d4b9ef3f7b Mon Sep 17 00:00:00 2001
From: Luke Bakken <lbakken@basho.com>
Date: Thu, 9 Jun 2016 07:54:46 -0700
Subject: [PATCH 2/3] Only run unit tests as default rake target, update Travis
 CI setup

---
 .travis.yml | 34 ++++++----------------------------
 Rakefile    |  4 ++--
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0b84a312..910b8cef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,32 +1,10 @@
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - jruby-18mode
-  - jruby-19mode
-  - jruby-head
-  - rbx-18mode
-  - rbx-19mode
-matrix:
-  allow_failures:
-    - rvm: jruby-head
-    - rvm: jruby-18mode
-    - rvm: jruby-19mode
-    - rvm: rbx-18mode
-    - rvm: rbx-19mode
-services:
-  - riak
+  - 1.9
+  - 2.0
+  - 2.1
+  - 2.2
+  - jruby
 bundler_args: --without=guard
-before_script:
-  - "curl http://apt.basho.com/gpg/basho.apt.key | sudo apt-key add -"
-  - 'sudo bash -c "echo deb http://apt.basho.com $(lsb_release -sc) main > /etc/apt/sources.list.d/basho.list"'
-  - "sudo apt-get update"
-  - "yes n | sudo apt-get install riak"
-  - "sudo service riak start"
-  - ! 'echo "root: .riaktest" > spec/support/test_server.yml'
-  - ! 'echo "source: /usr/sbin" >> spec/support/test_server.yml'
-  - "ulimit -n 2048"
 notifications:
   webhooks: http://basho-engbot.herokuapp.com/travis?key=d9ab1d53db09fc1760d7a5dde3246201522ca2c7
-  email: sean@basho.com
+  email: clients@basho.com
diff --git a/Rakefile b/Rakefile
index 04e96385..3de69dba 100644
--- a/Rakefile
+++ b/Rakefile
@@ -82,9 +82,9 @@ namespace :spec do
   end
 end
 
-desc "Run All Specs (including slow specs, excluding time_series)"
+desc "Run Unit Test Specs (excluding slow, integration and time_series)"
 RSpec::Core::RakeTask.new(:ci) do |spec|
-  spec.rspec_opts = %w[--profile --tag '~time_series']
+  spec.rspec_opts = %w[--profile --tag '~slow' --tag '~integration' --tag '~time_series']
 end
 task :default => :ci
 

From becd93950bd3b52e6297e6c93d9d743e33819360 Mon Sep 17 00:00:00 2001
From: Luke Bakken <lbakken@basho.com>
Date: Thu, 9 Jun 2016 07:56:16 -0700
Subject: [PATCH 3/3] Add contributor

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 69021709..cfc51598 100644
--- a/README.md
+++ b/README.md
@@ -665,6 +665,7 @@ Thank you to all of our contributors!
 * [Eric Cestari](https://github.com/cstar)
 * [Eric Redmond](https://github.com/coderoshi)
 * [Hidekazu Tanaka](https://github.com/holidayworking)
+* [Hiroyasu Ohyama](https://github.com/userlocalhost2000)
 * [Jace](https://github.com/jace)
 * [Jack Dempsey](https://github.com/jackdempsey)
 * Jay Adkisson