Commit graph

5 commits

Author SHA1 Message Date
Tim Nagel b155f304e4 Move IndexManager's resolution to tagged index services 2014-06-18 16:49:57 +10:00
Tim Nagel 8905b4248c Rename Manager to ConfigManager 2014-06-18 16:47:01 +10:00
Tim Nagel ec5c05e8be dev 2014-06-17 23:22:58 +10:00
Tim Nagel e78950ddb7 Merge branch 'master' into typed-config
Conflicts:
	CHANGELOG-3.0.md
	Client.php
	DependencyInjection/Configuration.php
	DependencyInjection/FOSElasticaExtension.php
	DynamicIndex.php
	Resources/config/config.xml
	Resources/config/mongodb.xml
	Resources/config/orm.xml
	Tests/DependencyInjection/ConfigurationTest.php
	composer.json
2014-06-17 22:42:15 +10:00
Tim Nagel 1dc6856ef9 Configuration rework 2014-06-02 00:40:03 +10:00