diff -Nru python-elasticsearch-1.5.0/Changelog.rst python-elasticsearch-1.6.0/Changelog.rst --- python-elasticsearch-1.5.0/Changelog.rst 2015-05-18 14:03:00.000000000 +0000 +++ python-elasticsearch-1.6.0/Changelog.rst 2015-06-10 00:38:35.000000000 +0000 @@ -3,6 +3,11 @@ Changelog ========= +1.6.0 (2015-06-10) +------------------ + + * Add ``indices.flush_synced`` API + 1.5.0 (2015-05-18) ------------------ diff -Nru python-elasticsearch-1.5.0/debian/changelog python-elasticsearch-1.6.0/debian/changelog --- python-elasticsearch-1.5.0/debian/changelog 2015-05-26 13:14:38.000000000 +0000 +++ python-elasticsearch-1.6.0/debian/changelog 2015-06-18 15:06:11.000000000 +0000 @@ -1,3 +1,9 @@ +python-elasticsearch (1.6.0-1) unstable; urgency=medium + + * New upstream release. + + -- Michael Fladischer Thu, 18 Jun 2015 16:52:40 +0200 + python-elasticsearch (1.5.0-1) unstable; urgency=medium * New upstream release. diff -Nru python-elasticsearch-1.5.0/docs/Changelog.rst python-elasticsearch-1.6.0/docs/Changelog.rst --- python-elasticsearch-1.5.0/docs/Changelog.rst 2015-05-18 14:03:00.000000000 +0000 +++ python-elasticsearch-1.6.0/docs/Changelog.rst 2015-06-10 00:38:35.000000000 +0000 @@ -3,6 +3,11 @@ Changelog ========= +1.6.0 (2015-06-10) +------------------ + + * Add ``indices.flush_synced`` API + 1.5.0 (2015-05-18) ------------------ diff -Nru python-elasticsearch-1.5.0/docs/conf.py python-elasticsearch-1.6.0/docs/conf.py --- python-elasticsearch-1.5.0/docs/conf.py 2015-05-18 14:03:00.000000000 +0000 +++ python-elasticsearch-1.6.0/docs/conf.py 2015-06-10 00:38:35.000000000 +0000 @@ -50,9 +50,9 @@ # built documents. # # The short X.Y version. -version = '1.5.0' +version = '1.6.0' # The full version, including alpha/beta/rc tags. -release = '1.5.0' +release = '1.6.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff -Nru python-elasticsearch-1.5.0/elasticsearch/client/indices.py python-elasticsearch-1.6.0/elasticsearch/client/indices.py --- python-elasticsearch-1.5.0/elasticsearch/client/indices.py 2015-05-18 14:03:00.000000000 +0000 +++ python-elasticsearch-1.6.0/elasticsearch/client/indices.py 2015-06-10 00:38:35.000000000 +0000 @@ -954,3 +954,17 @@ _, data = self.transport.perform_request('GET', _make_path(index, '_upgrade'), params=params) return data + + @query_params() + def flush_synced(self, index=None, params=None): + """ + Perform a normal flush, then add a generated unique marker (sync_id) to all shards. + ``_ + + :arg index: A comma-separated list of index names; use `_all` or empty + string for all indices + """ + _, data = self.transport.perform_request('POST', _make_path(index, + '_flush', 'synced'), params=params) + return data + diff -Nru python-elasticsearch-1.5.0/elasticsearch/client/__init__.py python-elasticsearch-1.6.0/elasticsearch/client/__init__.py --- python-elasticsearch-1.5.0/elasticsearch/client/__init__.py 2015-05-18 14:03:00.000000000 +0000 +++ python-elasticsearch-1.6.0/elasticsearch/client/__init__.py 2015-06-10 00:38:35.000000000 +0000 @@ -425,7 +425,7 @@ @query_params('_source', '_source_exclude', '_source_include', 'analyze_wildcard', 'analyzer', 'default_operator', 'df', - 'explain', 'fields', 'indices_boost', 'lenient', + 'explain', 'fielddata_fields', 'fields', 'indices_boost', 'lenient', 'allow_no_indices', 'expand_wildcards', 'ignore_unavailable', 'lowercase_expanded_terms', 'from_', 'preference', 'q', 'query_cache', 'routing', 'scroll', 'search_type', 'size', 'sort', 'source', 'stats', @@ -456,6 +456,8 @@ the query string :arg explain: Specify whether to return detailed information about score computation as part of a hit + :arg fielddata_fields: A comma-separated list of fields to return as the + field data representation of a field for each hit :arg fields: A comma-separated list of fields to return as part of a hit :arg indices_boost: Comma-separated list of index boosts :arg lenient: Specify whether format-based query failures (such as diff -Nru python-elasticsearch-1.5.0/elasticsearch/client/utils.py python-elasticsearch-1.6.0/elasticsearch/client/utils.py --- python-elasticsearch-1.5.0/elasticsearch/client/utils.py 2015-05-18 14:03:00.000000000 +0000 +++ python-elasticsearch-1.6.0/elasticsearch/client/utils.py 2015-06-10 00:38:35.000000000 +0000 @@ -47,7 +47,7 @@ quote_plus(_escape(p), b',*') for p in parts if p not in SKIP_IN_PATH) # parameters that apply to all methods -GLOBAL_PARAMS = ('pretty', 'format') +GLOBAL_PARAMS = ('pretty', 'format', 'filter_path') def query_params(*es_query_params): """ diff -Nru python-elasticsearch-1.5.0/elasticsearch/__init__.py python-elasticsearch-1.6.0/elasticsearch/__init__.py --- python-elasticsearch-1.5.0/elasticsearch/__init__.py 2015-05-18 14:03:00.000000000 +0000 +++ python-elasticsearch-1.6.0/elasticsearch/__init__.py 2015-06-10 00:38:35.000000000 +0000 @@ -1,6 +1,6 @@ from __future__ import absolute_import -VERSION = (1, 5, 0) +VERSION = (1, 6, 0) __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION)) diff -Nru python-elasticsearch-1.5.0/setup.py python-elasticsearch-1.6.0/setup.py --- python-elasticsearch-1.5.0/setup.py 2015-05-18 14:03:00.000000000 +0000 +++ python-elasticsearch-1.6.0/setup.py 2015-06-10 00:38:35.000000000 +0000 @@ -4,7 +4,7 @@ import sys import os -VERSION = (1, 5, 0) +VERSION = (1, 6, 0) __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION))