diff --git a/CHANGELOG.md b/CHANGELOG.md
index f39a10e7b..073e729af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,30 @@ Redisson Releases History
Try __[Redisson PRO](https://redisson.pro)__ version.
+### 14-May-2018 - versions 2.12.0 and 3.7.0 released
+Feature - __Proxy mode__ Please refer to [documentation](https://github.com/redisson/redisson/wiki/2.-Configuration#29-proxy-mode) for more details
+Feature - __Transaction API implementation__ Please refer to [documentation](https://github.com/redisson/redisson/wiki/10.-additional-features/#104-transactions) for more details
+Feature - __Spring Transaction API implementation__ Please refer to [documentation](https://github.com/redisson/redisson/wiki/14.-Integration-with-frameworks/#147-spring-transaction-manager) for more details
+Feature - __XA Transaction API implementation__ Please refer to [documentation](https://github.com/redisson/redisson/wiki/10.-additional-features/#105-xa-transactions) for more details
+Feature - `RPermitExpirableSemaphoreReactive` object added
+Feature - `RMap.fastReplace` method added
+Feature - PING support for Pub/Sub connections
+Improvement - `RBatch` object settings extracted as BatchOptions object
+Improvement - `RBitSet.set` method should return boolean
+Fixed - New IP discovery through DNS doesn't work for cluster mode
+Fixed - replication for Tomcat Session Manager with `readMode=INMEMORY`
+Fixed - `pingConnectionInterval` is not applied
+Fixed - JDK10 compatibility
+Fixed - `RLiveObjectService.delete` throws NPE if entity doesn't exist
+Fixed - `RSemaphore` object doesn't work with zero permit
+Fixed - `RExecutorService.countActiveWorkers` hangs if there are no registered workers
+Fixed - Iterator loop and incorrect result returning
+Fixed - SSL connection to Azure redis is failed
+Fixed - NPE in SentinelConnectionManager
+Fixed - RemoteService synchronous invocations aren't thread safe (regression since 2.10.5 / 3.5.5 versions)
+Fixed - `bad argument #1 to 'len' (string expected, got boolean)` error arise for `RMapCache` object
+Fixed - `RedisTimeoutException` arise during blocking command execution on RBlockingQueue and RBlockingDeque objects
+
### 09-Apr-2018 - versions 2.11.5 and 3.6.5 released
Feature - `RKeys.copy` method added
Feature - `RObject.copy` method added
diff --git a/README.md b/README.md
index cb3e95a11..fd464e27a 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,8 @@ Based on high-performance async and lock-free Java Redis client and [Netty](http
| Stable
Release Version | Release Date | JDK Version
compatibility | `CompletionStage`
support | `ProjectReactor` version
compatibility |
| ------------- | ------------- | ------------| -----------| -----------|
-| 3.6.5 | 09.04.2018 | 1.8, 1.9+ | Yes | 3.1.x |
-| 2.11.5 | 09.04.2018 | 1.6, 1.7, 1.8, 1.9 and Android | No | 2.0.8 |
+| 3.7.0 | 14.05.2018 | 1.8, 1.9, 1.10+ | Yes | 3.1.x |
+| 2.12.0 | 14.05.2018 | 1.6, 1.7, 1.8, 1.9, 1.10, Android | No | 2.0.8 |
Features
@@ -39,7 +39,10 @@ Features
Remote service, Live Object service, Executor service, Scheduler service, MapReduce service
* [Spring Framework](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks#141-spring-framework)
* [Spring Cache](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks/#142-spring-cache) implementation
+* [Spring Transaction API](https://github.com/redisson/redisson/wiki/14.-Integration-with-frameworks/#147-spring-transaction-manager) implementation
* [Hibernate Cache](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks/#143-hibernate-cache) implementation
+* [Transactions API](https://github.com/redisson/redisson/wiki/10.-Additional-features#104-transactions)
+* [XA Transaction API](https://github.com/redisson/redisson/wiki/10.-additional-features/#105-xa-transactions) implementation
* [JCache API (JSR-107)](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks/#144-jcache-api-jsr-107-implementation) implementation
* [Tomcat Session Manager](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks#145-tomcat-redis-session-manager) implementation
* [Spring Session](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks/#146-spring-session) implementation
@@ -50,7 +53,7 @@ Features
* Supports OSGi
* Supports SSL
* Supports many popular codecs ([Jackson JSON](https://github.com/FasterXML/jackson), [Avro](http://avro.apache.org/), [Smile](http://wiki.fasterxml.com/SmileFormatSpec), [CBOR](http://cbor.io/), [MsgPack](http://msgpack.org/), [Kryo](https://github.com/EsotericSoftware/kryo), [Amazon Ion](https://amzn.github.io/ion-docs/), [FST](https://github.com/RuedigerMoeller/fast-serialization), [LZ4](https://github.com/jpountz/lz4-java), [Snappy](https://github.com/xerial/snappy-java) and JDK Serialization)
-* With over 1000 unit tests
+* With over 1800 unit tests
Used by
================================
@@ -95,23 +98,23 @@ Quick start
org.redisson
redisson
- 3.6.5
+ 3.7.0
org.redisson
redisson
- 2.11.5
+ 2.11.0
#### Gradle
// JDK 1.8+ compatible
- compile 'org.redisson:redisson:3.6.5'
+ compile 'org.redisson:redisson:3.7.0'
// JDK 1.6+ compatible
- compile 'org.redisson:redisson:2.11.5'
+ compile 'org.redisson:redisson:2.12.0'
#### Java
@@ -136,11 +139,11 @@ RExecutorService executor = redisson.getExecutorService("myExecutorService");
Downloads
===============================
-[Redisson 3.6.5](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson&v=3.6.5&e=jar),
-[Redisson node 3.6.5](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson-all&v=3.6.5&e=jar)
+[Redisson 3.7.0](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson&v=3.7.0&e=jar),
+[Redisson node 3.7.0](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson-all&v=3.7.0&e=jar)
-[Redisson 2.11.5](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson&v=2.11.5&e=jar),
-[Redisson node 2.11.5](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson-all&v=2.11.5&e=jar)
+[Redisson 2.12.0](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson&v=2.12.0&e=jar),
+[Redisson node 2.12.0](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson-all&v=2.12.0&e=jar)
FAQs
===============================