Skip to content

Commit 2ea88ab

Browse files
gmoskoviczgmoskovicz
committed
Merge branch 'develop' of https://github.com/elastic/elasticsearch-net into 1433-support-generic-reindex
2 parents d1f0f42 + 9565667 commit 2ea88ab

File tree

206 files changed

+13087
-3683
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+13087
-3683
lines changed

‎build/Elasticsearch.Net.Connection.HttpClient.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Elasticsearch.Net.Connection.HttpClient</id>
5-
<version>1.5.1</version>
5+
<version>1.6.0</version>
66
<title>Elasticsearch.Net.Connection.HttpClient - IConnection implementation that uses Http</title>
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>
@@ -13,7 +13,7 @@
1313
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1414
<description>An IConnection implementation that uses System.Net.Http.HttpClient to talk with elasticsearch</description>
1515
<dependencies>
16-
<dependency id="Elasticsearch.Net" version="1.5.1"/>
16+
<dependency id="Elasticsearch.Net" version="1.6.0"/>
1717
</dependencies>
1818
<tags>elasticsearch elastic search lucene thrift nest</tags>
1919
</metadata>

‎build/Elasticsearch.Net.Connection.Thrift.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Elasticsearch.Net.Connection.Thrift</id>
5-
<version>1.5.1</version>
5+
<version>1.6.0</version>
66
<title>Elasticsearch.Net.Connection.Thrift - Thrift support for Elasticsearch.Net</title>
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>
@@ -13,7 +13,7 @@
1313
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1414
<description>An IConnection implementation that utilizes Apache Thrift to talk with elasticsearch</description>
1515
<dependencies>
16-
<dependency id="Elasticsearch.Net" version="1.5.1"/>
16+
<dependency id="Elasticsearch.Net" version="1.6.0"/>
1717
</dependencies>
1818
<tags>elasticsearch elastic search lucene thrift nest</tags>
1919
</metadata>

‎build/Elasticsearch.Net.JsonNET.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Elasticsearch.Net.JsonNET</id>
5-
<version>1.5.1</version>
5+
<version>1.6.0</version>
66
<title>Elasticsearch.Net.JsonNET - Json.NET serializer for the low level elasticsearch client</title>
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>
@@ -13,7 +13,7 @@
1313
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1414
<description>This package is only useful if you use the low level client ONLY and do not use NEST but would like to use JSON.NET as your serializer</description>
1515
<dependencies>
16-
<dependency id="Elasticsearch.Net" version="1.5.1"/>
16+
<dependency id="Elasticsearch.Net" version="1.6.0"/>
1717
<dependency id="Newtonsoft.Json" version="6.0.1"/>
1818
</dependencies>
1919
<tags>elasticsearch elastic search lucene thrift nest</tags>

‎build/Elasticsearch.Net.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Elasticsearch.Net</id>
5-
<version>1.5.1</version>
5+
<version>1.6.0</version>
66
<title>Elasticsearch.Net - official low level elasticsearch client</title>
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>

‎build/NEST.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>NEST</id>
5-
<version>1.5.1</version>
5+
<version>1.6.0</version>
66
<title>NEST - Elasticsearch Client</title>
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>
@@ -13,7 +13,7 @@
1313
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1414
<description>Elasticsearch client, strongly typed interface to Elasticsearch. Fluent request builder, mapped responses and powerful query dsl. Uses and exposes Elasticsearch.Net</description>
1515
<dependencies>
16-
<dependency id="Elasticsearch.Net" version="1.5.1"/>
16+
<dependency id="Elasticsearch.Net" version="1.6.0"/>
1717
<dependency id="Newtonsoft.Json" version="6.0.1" />
1818
</dependencies>
1919
<tags>elasticsearch elastic search lucene nest</tags>

‎src/CodeGeneration/CodeGeneration.LowLevelClient/ApiEndpoints/bulk.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"bulk": {
3-
"documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/docs-bulk.html",
3+
"documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/1.6/docs-bulk.html",
44
"methods": ["POST", "PUT"],
55
"url": {
66
"path": "/_bulk",

‎src/CodeGeneration/CodeGeneration.LowLevelClient/ApiEndpoints/cat.aliases.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"cat.aliases": {
3-
"documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/cat-alias.html",
3+
"documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/1.6/cat-alias.html",
44
"methods": ["GET"],
55
"url": {
66
"path": "/_cat/aliases",

‎src/CodeGeneration/CodeGeneration.LowLevelClient/ApiEndpoints/cat.allocation.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"cat.allocation": {
3-
"documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/cat-allocation.html",
3+
"documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/1.6/cat-allocation.html",
44
"methods": ["GET"],
55
"url": {
66
"path": "/_cat/allocation",

‎src/CodeGeneration/CodeGeneration.LowLevelClient/ApiEndpoints/cat.count.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"cat.count": {
3-
"documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/cat-count.html",
3+
"documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/1.6/cat-count.html",
44
"methods": ["GET"],
55
"url": {
66
"path": "/_cat/count",

‎src/CodeGeneration/CodeGeneration.LowLevelClient/ApiEndpoints/cat.fielddata.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"cat.fielddata": {
3-
"documentation": "http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/cat-fielddata.html",
3+
"documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-fielddata.html",
44
"methods": ["GET"],
55
"url": {
66
"path": "/_cat/fielddata",

0 commit comments

Comments
 (0)