From 65a4ac7b2debeb27867d126ec7ab0a9c1127936e Mon Sep 17 00:00:00 2001
From: Mantas Varatiejus <mantas.varatiejus@nfq.com>
Date: Mon, 1 Feb 2016 16:05:03 +0200
Subject: [PATCH] Update CHANGELOG
---
CHANGELOG.md | 2 +-
composer.json | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e379104..ad6f0a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
CHANGELOG
=========
-v1.x (2016-x)
+v1.1.2 (2016-02-01)
---
- Deprecated `FuzzyLikeThisQuery` and `FuzzyLikeThisFieldQuery` queries
diff --git a/composer.json b/composer.json
index 59e317d..f64cada 100644
--- a/composer.json
+++ b/composer.json
@@ -29,5 +29,11 @@
"psr-4": {
"ONGR\\ElasticsearchDSL\\Tests\\": "tests/"
}
+ },
+ "minimum-stability": "dev",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.1-dev"
+ }
}
}
--
GitLab