Merge branch 'master' into proptest

Author: Hoverbear

.travis.yml

@@ -8,7 +8,7 @@ os:
 rust:
   # Requires nightly for now, stable can be re-enabled when 1.36 is stable.
   # - stable
-  - nightly
+  - nightly-2019-05-22
 env:
   global:
     - RUST_BACKTRACE=1

README.md

@@ -1,6 +1,6 @@
 # TiKV Client (Rust)
 
-[![Build Status](https://travis-ci.org/tikv/client-rust.svg?branch=master)](https://travis-ci.org/pingcap/client-rust)
+[![Build Status](https://travis-ci.org/tikv/client-rust.svg?branch=master)](https://travis-ci.org/tikv/client-rust)
 [![Documentation](https://docs.rs/tikv-client/badge.svg)](https://docs.rs/tikv-client/)
 
 > Currently this crate is experimental and some portions (e.g. the Transactional API) are still in active development. You're encouraged to use this library for testing and to help us find problems!

rust-toolchain

@@ -1 +1,5 @@
-nightly-2019-06-01
+<<<<<<< HEAD
+nightly-2019-06-01
+=======
+nightly-2019-05-22
+>>>>>>> master