From f9c95f9c7d05faca8bd60b444c5176e0f31a38b5 Mon Sep 17 00:00:00 2001
From: Yasuo Honda <yasuo.honda@gmail.com>
Date: Thu, 1 Apr 2021 21:36:25 +0900
Subject: [PATCH] Merge pull request #2169 from yahonda/prepare_v614

Prepare release v6.1.4 [skip ci]
---
 History.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/History.md b/History.md
index 9b69a84b6..e8f62696e 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,14 @@
+## 6.1.4 / 2021-04-01
+
+* Changes and bug fixes
+  * Support use of ojdbc11.jar [#2155, #2168]
+  * Add missing default granted permission "ulimited tablespace" [#2156, #2167]
+  * Prevent from including ojdbc8.jar file to gem file [#2163, #2164, #2165]
+  * Oracle enhanced adapter 6.1.3 has been yanked since #2163
+
+* CI
+  * Allow-failure CI against jruby-head for release61 branch [#2166]
+
 ## 6.1.3 / 2021-03-31
 
 * Changes and bug fixes