elasticsearch/elasticsearch — pull request #8675 by brwe (2014-11-26 17:38:45+00:00)
Title: function_score: use query and filter together

Before, if filter and query was defined for function_score, then the
filter was silently ignored. Now, if both is defined then function score
query wraps this in a filtered_query.

closes #8638