From 47486aed45c2aa0961b002b9afb60503bfed5b85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20de=20Guillebon?= Date: Wed, 24 Mar 2021 12:59:44 +0100 Subject: [PATCH] Prepare 6.1.5 release (#1951) --- CHANGELOG.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2131255c1b..077b9f845a 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,21 @@ # Change Log All notable changes to this project will be documented in this file based on the [Keep a Changelog](http://keepachangelog.com/) Standard. This project adheres to [Semantic Versioning](http://semver.org/). -## [Unreleased](https://github.com/ruflin/Elastica/compare/6.1.4...6.x) +## [Unreleased](https://github.com/ruflin/Elastica/compare/6.1.5...6.x) ### Backward Compatibility Breaks ### Bugfixes -* Added conflict with `elasticsearch/elasticsearch` version `6.8.1` [#1948](https://github.com/ruflin/Elastica/pull/1948) ### Added ### Improvements ### Deprecated +## [6.1.5](https://github.com/ruflin/Elastica/compare/6.1.4...6.1.5) + +### Bugfixes +* Added conflict with `elasticsearch/elasticsearch` version `6.8.1` [#1948](https://github.com/ruflin/Elastica/pull/1948) +### Added +* Excluded `docker` directory in `.gitattributes` [#1939](https://github.com/ruflin/Elastica/pull/1939) + ## [6.1.4](https://github.com/ruflin/Elastica/compare/6.1.3...6.1.4) ### Backward Compatibility Breaks