deblan/FOSElasticaBundle
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch '3.0.x'

Browse source
This commit is contained in:
WouterJ.nl bot 2015-02-18 11:38:02 +01:00
parent e1d5ef72d2 2401b1083c
commit 3c87cc16c7
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG-3.0.md
View file

@ -12,10 +12,11 @@ https://github.com/FriendsOfSymfony/FOSElasticaBundle/compare/v3.0.0...v3.0.1
To generate a changelog summary since the last version, run To generate a changelog summary since the last version, run
`git log --no-merges --oneline v3.0.0...3.0.x` `git log --no-merges --oneline v3.0.0...3.0.x`
* 3.0.8 (Unreleased) * 3.0.8 (2014-01-31)
* Fixed handling of empty indexes #760 * Fixed handling of empty indexes #760
* Added support for `connectionStrategy` Elastica configuration #732 * Added support for `connectionStrategy` Elastica configuration #732
* Allow Elastica 1.4
* 3.0.7 (2015-01-21) * 3.0.7 (2015-01-21)

2
composer.json
View file

@ -17,7 +17,7 @@
"symfony/console": "~2.1", "symfony/console": "~2.1",
"symfony/form": "~2.1", "symfony/form": "~2.1",
"symfony/property-access": "~2.2", "symfony/property-access": "~2.2",
"ruflin/elastica": ">=0.90.10.0, <1.4-dev", "ruflin/elastica": ">=0.90.10.0, <1.5-dev",
"psr/log": "~1.0" "psr/log": "~1.0"
}, },
"require-dev":{ "require-dev":{