Commit graph

785 commits

Author SHA1 Message Date
Ray 41b347dfe4 Merge remote-tracking branch 'upstream/master'
Conflicts:
	Logger/ElasticaLogger.php
	README.md
2014-03-18 19:59:27 -04:30
rayrigam de70e78b53 Update Configuration.php
Updated to support any HTTP request header type in the "headers" section.
2014-03-18 18:14:03 -04:30
Tim Nagel babe20800e Updated changelog 2014-03-18 09:12:11 +11:00
Tim Nagel 7d13823488 Bump symfony requirement 2014-03-18 09:10:44 +11:00
Tim Nagel dc01b189ed Update CHANGELOG-3.0.md 2014-03-17 09:26:16 +11:00
Tim Nagel 5292a2adad Merge pull request #463 from FriendsOfSymfony/add-hotswapping-aliased-indexes-on-populate
Add support for using aliases to allow hot swapping of indexes.
2014-03-17 09:20:12 +11:00
Tim Nagel 49521e9fc4 Merge branch 'master' into add-hotswapping-aliased-indexes-on-populate
Conflicts:
	Resetter.php
2014-03-17 09:18:57 +11:00
Tim Nagel 857c1c8e48 Merge pull request #415 from nurikabe/master
Refactoring to update ElasticSearch index in postFush
2014-03-17 09:11:43 +11:00
Tim Nagel cdd6e3af45 Bump elastica version 2014-03-14 08:59:59 +11:00
Tim Nagel 6cd69ad131 Merge pull request #361 from xphere-forks/master
Add support for include_in_parent and include_in_root options
2014-03-14 08:53:42 +11:00
Tim Nagel 7cf8cd446f Merge pull request #501 from FriendsOfSymfony/reset-type-ignore-type-missing-exception
Ignore TypeMissingException when resetting a single type. This allows to...
2014-03-14 08:48:59 +11:00
Tim Nagel 6beafd23f1 Merge pull request #494 from bastnic/patch-1
[doc] inform about the override of Elastica logger
2014-03-14 08:44:06 +11:00
Tim Nagel da0abca38c Merge pull request #487 from XWB/logger-cleanup
ElasticaLogger cleanup
2014-03-14 08:43:42 +11:00
Tim Nagel 48edc195cd Merge pull request #484 from bits4breakfast/containeraware-callback
Container is now available in Callback
2014-03-14 08:41:15 +11:00
Lea Haensenberger 2f9896c893 Check for TypeMissingException anywhere in exception message 2014-03-13 10:45:57 +01:00
Lea Haensenberger 726892c586 Ignore TypeMissingException when resetting a single type. This allows to create new types without having to recreate the whole index. 2014-03-13 10:43:35 +01:00
Lukas Kahwe Smith 33f85bec22 Merge pull request #499 from mvrhov/patch-2
Fix wrong annotation
2014-03-11 15:18:36 +01:00
Miha Vrhovnik fe871c5ac4 Fix wrong annotation 2014-03-11 14:50:00 +01:00
Ray 0116a6ac4f Add support for clients requiring basic HTTP authentication 2014-03-06 12:38:23 -04:30
Berny Cantos 7f53badad5 Add support for include_in_{parent,root} for nested and objects 2014-03-06 12:31:50 +01:00
Bastien Jaillot a1f7449efc [doc] inform about the override of Elastica logger
Add a documentation related to this change: https://github.com/FriendsOfSymfony/FOSElasticaBundle/pull/395#issuecomment-27729759
2014-03-05 16:13:51 +01:00
Tim Nagel 245732781b Merge pull request #493 from tgallice/url_parameter_fix
Rework configuration validation to fix #461
2014-03-05 09:12:44 +11:00
tgallice 418b9d72ce Rework configuration validation to fix #461 2014-03-04 17:58:10 +01:00
Karel Souffriau 2b04f6cf34 ElasticaLogger cleanup 2014-02-25 11:05:26 +01:00
Matteo Galli eecdd3474a Fixes #459 2014-02-21 16:47:42 +01:00
Tim Nagel c8c72f5f0b Merge pull request #481 from XWB/abstract-provider-cleanup
AbstractProvider cleanup
2014-02-21 09:23:45 +11:00
Tim Nagel 6f8b3a5a0f Fix populate command option 2014-02-21 08:58:43 +11:00
Karel Souffriau 1c74f61b4e AbstractProvider cleanup 2014-02-20 12:57:10 +01:00
Tim Nagel b7d664c665 Merge pull request #480 from XWB/populate-command-hotfix
Fixed bug made in #479
2014-02-19 23:02:13 +11:00
Karel Souffriau 891dd51abe Fixed bug made in #479 2014-02-19 12:50:48 +01:00
Tim Nagel dd718c9a63 Merge pull request #479 from XWB/populate-command-fix
Tweak: use hasOption() in PopulateCommand instead of checking for booleans
2014-02-19 22:45:37 +11:00
Karel Souffriau 63cca11a0b Tweak: use hasOption() in PopulateCommand instead of checking for booleans 2014-02-19 12:43:44 +01:00
Tim Nagel 20b16d4f8c Merge pull request #478 from XWB/fix-tests
Fixes in "stop on error" feature
2014-02-19 22:40:47 +11:00
Karel Souffriau 44180793fc Add changelog file for 3.0 2014-02-19 12:36:39 +01:00
Karel Souffriau 41bf07ec59 Fixed issues in #426 2014-02-19 12:19:34 +01:00
Tim Nagel 5fff46cc60 Merge pull request #477 from XWB/cs-fix
CS fix in AbstractProvider
2014-02-19 20:13:26 +11:00
Karel Souffriau b8cc6d758c CS fix in AbstractProvider 2014-02-19 09:31:22 +01:00
Tim Nagel d03d494d30 Merge remote-tracking branch 'tgabi/stop-on-error' 2014-02-19 13:50:33 +11:00
Tim Nagel efc1794d3f Merge pull request #447 from astina-forks/populate_interactive_fix
Populate command: use isInteractive() instead of option
2014-02-19 13:46:09 +11:00
Tim Nagel e6f1d9ffe8 Merge pull request #454 from elfafa/master
Add RAM (current & peak) in populate evolution information
2014-02-19 13:45:24 +11:00
Tim Nagel 92b7fd981b Merge pull request #458 from digitalkaoz/patch-1
fixes ignore_missing option and unknown index
2014-02-19 13:44:42 +11:00
Tim Nagel cb2eeba318 Merge pull request #461 from tgallice/url_parameter
Force slash at the end of the url parameter
2014-02-19 13:40:18 +11:00
Tim Nagel 13e81fd7bb Merge pull request #462 from oohnoitz/master
added support for setting search options
2014-02-19 13:40:03 +11:00
Tim Nagel aa9d74a8a0 Merge remote-tracking branch 'PeerJ/AddServerTimeout'
Conflicts:
	DependencyInjection/Configuration.php
2014-02-19 13:39:03 +11:00
Tim Nagel 5a36d8f769 Merge pull request #468 from FriendsOfSymfony/fix-reset-index-type
Keep all special mapping fields for types when resetting a single type. ...
2014-02-19 13:31:29 +11:00
Hung Tran 7d2776e27a fixed phpdoc 2014-02-18 10:12:31 -06:00
Patrick McAndrew 3065c96a2c Add ability to specify server timeout 2014-02-14 17:32:22 +00:00
Lea Haensenberger 765e400278 handle _parent separately 2014-02-13 10:06:10 +01:00
Lea Haensenberger ead3c95c88 Keep dynamic templates 2014-02-13 09:45:27 +01:00
Lea Haensenberger 1402bdc9e6 Keep all special mapping fields for types when resetting a single type. Field list is according to the current documentation of elasticsearch 0.90 2014-02-13 09:13:36 +01:00