From 00e9a49460142aeb099a314e00ef151ae2728d53 Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Thu, 6 Jun 2013 11:02:55 -0400 Subject: [PATCH 1/3] Allow Symfony dependencies until 3.0 --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index a4969a0..def510b 100644 --- a/composer.json +++ b/composer.json @@ -12,9 +12,9 @@ ], "require": { "php": ">=5.3.2", - "symfony/framework-bundle": ">=2.1.0,<2.3.0-dev", - "symfony/console": ">=2.1.0,<2.3.0-dev", - "symfony/form": ">=2.1.0,<2.3.0-dev", + "symfony/framework-bundle": "~2.1", + "symfony/console": "~2.1", + "symfony/form": "~2.1", "ruflin/elastica": "0.19.8" }, "require-dev":{ @@ -25,7 +25,7 @@ "knplabs/knp-components": "1.2.*" }, "suggest": { - "symfony/property-access": "2.2.*", + "symfony/property-access": "~2.2", "doctrine/orm": ">=2.2,<2.5-dev", "doctrine/mongodb-odm": "1.0.*@dev", "propel/propel1": "1.6.*", From cd48a3668794fbc548192da10e0c60033eac1a78 Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Thu, 6 Jun 2013 11:05:31 -0400 Subject: [PATCH 2/3] Update 2.0.x changelog --- CHANGELOG-2.0.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG-2.0.md b/CHANGELOG-2.0.md index b384948..26c779c 100644 --- a/CHANGELOG-2.0.md +++ b/CHANGELOG-2.0.md @@ -12,6 +12,13 @@ https://github.com/FriendsOfSymfony/FOSElasticaBundle/compare/v2.0.0...v2.0.1 To generate a changelog summary since the last version, run `git log --no-merges --oneline v2.0.0...2.0.x` +* 2.0.2 (2013-06-06) + + * 00e9a49: Allow Symfony dependencies until 3.0 + * 4b4a56d: Check for "indexes" key in Configuration::getNestings() + * 8ffd1a7: Update install version and add links to compatibility info + * 58e983f: Document installation via composer in README (closes #271) + * 2.0.1 (2013-04-04) * f0d3a4d: Ensure mongo extension is available in Travis CI From 2dfbfffbd0dce5071e29c525f48aa760c5417b9f Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Thu, 6 Jun 2013 11:19:59 -0400 Subject: [PATCH 3/3] Update 2.1.x changelog --- CHANGELOG-2.1.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG-2.1.md b/CHANGELOG-2.1.md index f4373e7..4069cdd 100644 --- a/CHANGELOG-2.1.md +++ b/CHANGELOG-2.1.md @@ -12,7 +12,11 @@ https://github.com/FriendsOfSymfony/FOSElasticaBundle/compare/v2.1.0...v2.1.1 To generate a changelog summary since the last version, run `git log --no-merges --oneline v2.1.0...2.1.x` -* 2.1.0 (2013-5-15) +* 2.1.2 (2013-06-06) + + * 00e9a49: Allow Symfony dependencies until 3.0 + +* 2.1.1 (2013-05-15) * c05e0ca: Added documentation for ignoring missing hits * 00b67fd: Ignore missing index hits