Skip to content

Commit ece99e6

Browse files
MpdreamzMpdreamz
committed
Merge branch '1.x' of github.com:elastic/elasticsearch-net into 1.x
2 parents a08f3f6 + cc942f8 commit ece99e6

File tree

51 files changed

+3271
-2295
lines changed

Some content is hidden

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

51 files changed

+3271
-2295
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,6 @@ Cache
5959
YamlCache
6060

6161
*.DS_Store
62-
*.sln.ide
62+
*.sln.ide
63+
64+
packages

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>
99
<iconUrl>http://nest.azurewebsites.net/images/elasticsearch-net-nuget-icon.png</iconUrl>
10-
<licenseUrl>https://github.com/elasticsearch/elasticsearch-net/blob/master/license.txt</licenseUrl>
11-
<projectUrl>https://github.com/elasticsearch/elasticsearch-net</projectUrl>
10+
<licenseUrl>https://github.com/elastic/elasticsearch-net/blob/master/license.txt</licenseUrl>
11+
<projectUrl>https://github.com/elastic/elasticsearch-net</projectUrl>
12+
<releaseNotes>See https://github.com/elastic/elasticsearch-net/releases/tag/$version$</releaseNotes>
1213
<summary>An IConnection implementation that uses System.Net.Http.HttpClient to talk with elasticsearch</summary>
1314
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1415
<description>An IConnection implementation that uses System.Net.Http.HttpClient to talk with elasticsearch</description>
1516
<dependencies>
16-
<dependency id="Elasticsearch.Net" version="[1.9.0,2)"/>
17+
<dependency id="Elasticsearch.Net" version="[1.9.1,2)"/>
1718
</dependencies>
1819
<tags>elasticsearch elastic search lucene thrift nest</tags>
1920
</metadata>

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>
99
<iconUrl>http://nest.azurewebsites.net/images/elasticsearch-net-nuget-icon.png</iconUrl>
10-
<licenseUrl>https://github.com/elasticsearch/elasticsearch-net/blob/master/license.txt</licenseUrl>
11-
<projectUrl>https://github.com/elasticsearch/elasticsearch-net</projectUrl>
10+
<licenseUrl>https://github.com/elastic/elasticsearch-net/blob/master/license.txt</licenseUrl>
11+
<projectUrl>https://github.com/elastic/elasticsearch-net</projectUrl>
12+
<releaseNotes>See https://github.com/elastic/elasticsearch-net/releases/tag/$version$</releaseNotes>
1213
<summary>An IConnection implementation that utilizes Apache Thrift to talk with elasticsearch</summary>
1314
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1415
<description>An IConnection implementation that utilizes Apache Thrift to talk with elasticsearch</description>
1516
<dependencies>
16-
<dependency id="Elasticsearch.Net" version="[1.9.0,2)"/>
17+
<dependency id="Elasticsearch.Net" version="[1.9.1,2)"/>
1718
</dependencies>
1819
<tags>elasticsearch elastic search lucene thrift nest</tags>
1920
</metadata>

‎build/Elasticsearch.Net.JsonNET.nuspec‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>
99
<iconUrl>http://nest.azurewebsites.net/images/elasticsearch-net-nuget-icon.png</iconUrl>
10-
<licenseUrl>https://github.com/elasticsearch/elasticsearch-net/blob/master/license.txt</licenseUrl>
11-
<projectUrl>https://github.com/elasticsearch/elasticsearch-net</projectUrl>
10+
<licenseUrl>https://github.com/elastic/elasticsearch-net/blob/master/license.txt</licenseUrl>
11+
<projectUrl>https://github.com/elastic/elasticsearch-net</projectUrl>
12+
<releaseNotes>See https://github.com/elastic/elasticsearch-net/releases/tag/$version$</releaseNotes>
1213
<summary>IElasticsearchSerializer implementation that allows you to use Json.NET with the lowlevel client</summary>
1314
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1415
<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>
1516
<dependencies>
16-
<dependency id="Elasticsearch.Net" version="[1.9.0,2)"/>
17+
<dependency id="Elasticsearch.Net" version="[1.9.1,2)"/>
1718
<dependency id="Newtonsoft.Json" version="[9,10)"/>
1819
</dependencies>
1920
<tags>elasticsearch elastic search lucene thrift nest</tags>

‎build/Elasticsearch.Net.nuspec‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>
99
<iconUrl>http://nest.azurewebsites.net/images/elasticsearch-net-nuget-icon.png</iconUrl>
10-
<licenseUrl>https://github.com/elasticsearch/elasticsearch-net/blob/master/license.txt</licenseUrl>
11-
<projectUrl>https://github.com/elasticsearch/elasticsearch-net</projectUrl>
10+
<licenseUrl>https://github.com/elastic/elasticsearch-net/blob/master/license.txt</licenseUrl>
11+
<projectUrl>https://github.com/elastic/elasticsearch-net</projectUrl>
12+
<releaseNotes>See https://github.com/elastic/elasticsearch-net/releases/tag/$version$</releaseNotes>
1213
<summary>
1314
Exposes all the api endpoints but leaves you in control of building the request and response bodies. Comes with built in cluster failover/connection pooling support.
1415
</summary>

‎build/NEST.nuspec‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
<authors>Elasticsearch Inc. and contributors</authors>
88
<owners>Elasticsearch Inc.</owners>
99
<iconUrl>http://nest.azurewebsites.net/images/nest-nuget-icon.png</iconUrl>
10-
<licenseUrl>https://github.com/elasticsearch/elasticsearch-net/blob/master/license.txt</licenseUrl>
11-
<projectUrl>https://github.com/elasticsearch/elasticsearch-net</projectUrl>
10+
<licenseUrl>https://github.com/elastic/elasticsearch-net/blob/master/license.txt</licenseUrl>
11+
<projectUrl>https://github.com/elastic/elasticsearch-net</projectUrl>
12+
<releaseNotes>See https://github.com/elastic/elasticsearch-net/releases/tag/$version$</releaseNotes>
1213
<summary>Strongly typed interface to Elasticsearch. Fluent request builder, mapped responses and powerful query dsl. Uses and exposes Elasticsearch.Net</summary>
1314
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1415
<description>Elasticsearch client, strongly typed interface to Elasticsearch. Fluent request builder, mapped responses and powerful query dsl. Uses and exposes Elasticsearch.Net</description>
1516
<dependencies>
16-
<dependency id="Elasticsearch.Net" version="[1.9.0,2)"/>
17+
<dependency id="Elasticsearch.Net" version="[1.9.1,2)"/>
1718
<dependency id="Newtonsoft.Json" version="[9,10)" />
1819
</dependencies>
1920
<tags>elasticsearch elastic search lucene nest</tags>

‎src/CodeGeneration/CodeGeneration.LowLevelClient/ApiEndpoints/indices.clear_cache.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"description" : "Clear filter caches"
3434
},
3535
"filter_keys": {
36-
"type" : "boolean",
36+
"type" : "list",
3737
"description" : "A comma-separated list of keys to clear when using the `filter_cache` parameter (default: all)"
3838
},
3939
"id": {

0 commit comments

Comments
 (0)