Skip to content

Commit 9e0f1b8

Browse files
gmarzgmarz
committed
Merge tag '1.3.1'
1.3.1 Conflicts: src/Nest/Properties/AssemblyInfo.cs
2 parents d11a1d6 + 09af17c commit 9e0f1b8

File tree

48 files changed

+586
-82
lines changed

Some content is hidden

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

48 files changed

+586
-82
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.3.0</version>
5+
<version>1.3.1</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.3.0"/>
16+
<dependency id="Elasticsearch.Net" version="1.3.1"/>
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.3.0</version>
5+
<version>1.3.1</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.3.0"/>
16+
<dependency id="Elasticsearch.Net" version="1.3.1"/>
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.3.0</version>
5+
<version>1.3.1</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.3.0"/>
16+
<dependency id="Elasticsearch.Net" version="1.3.1"/>
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.3.0</version>
5+
<version>1.3.1</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.3.0</version>
5+
<version>1.3.1</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.3.0"/>
16+
<dependency id="Elasticsearch.Net" version="1.3.1"/>
1717
<dependency id="Newtonsoft.Json" version="6.0.1" />
1818
</dependencies>
1919
<tags>elasticsearch elastic search lucene nest</tags>

‎src/CodeGeneration/CodeGeneration.LowLevelClient/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
[assembly: AssemblyCompanyAttribute("Elasticsearch")]
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
10-
[assembly: AssemblyFileVersionAttribute("1.3.0")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.3.0")]
10+
[assembly: AssemblyFileVersionAttribute("1.3.1")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.3.1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

‎src/CodeGeneration/CodeGeneration.YamlTestsRunner/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
[assembly: AssemblyCompanyAttribute("Elasticsearch")]
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
10-
[assembly: AssemblyFileVersionAttribute("1.3.0")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.3.0")]
10+
[assembly: AssemblyFileVersionAttribute("1.3.1")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.3.1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

‎src/Connections/Elasticsearch.Net.Connection.HttpClient/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
[assembly: AssemblyCompanyAttribute("Elasticsearch")]
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
10-
[assembly: AssemblyFileVersionAttribute("1.3.0")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.3.0")]
10+
[assembly: AssemblyFileVersionAttribute("1.3.1")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.3.1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

‎src/Connections/Elasticsearch.Net.Connection.Thrift/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
[assembly: AssemblyCompanyAttribute("Elasticsearch")]
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
10-
[assembly: AssemblyFileVersionAttribute("1.3.0")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.3.0")]
10+
[assembly: AssemblyFileVersionAttribute("1.3.1")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.3.1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

‎src/Elasticsearch.Net/Connection/Configuration/ConnectionConfiguration.cs‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ public class ConnectionConfiguration<T> : IConnectionConfigurationValues, IHideO
6161
private int? _maxDeadTimeout;
6262
int? IConnectionConfigurationValues.MaxDeadTimeout { get{ return _maxDeadTimeout; } }
6363

64+
private TimeSpan? _maxRetryTimeout;
65+
TimeSpan? IConnectionConfigurationValues.MaxRetryTimeout { get{ return _maxRetryTimeout; } }
66+
6467
private string _proxyUsername;
6568
string IConnectionConfigurationValues.ProxyUsername { get{ return _proxyUsername; } }
6669

@@ -278,6 +281,19 @@ public T SetMaxDeadTimeout(int timeout)
278281
this._maxDeadTimeout = timeout;
279282
return (T) this;
280283
}
284+
285+
/// <summary>
286+
/// Limits the total runtime including retries separately from <see cref="Timeout"/>
287+
/// <pre>
288+
/// When not specified defaults to <see cref="Timeout"/> which itself defaults to 60seconds
289+
/// </pre>
290+
/// </summary>
291+
public T SetMaxRetryTimeout(TimeSpan maxRetryTimeout)
292+
{
293+
this._maxRetryTimeout = maxRetryTimeout;
294+
return (T) this;
295+
}
296+
281297
/// <summary>
282298
/// Semaphore asynchronous connections automatically by giving
283299
/// it a maximum concurrent connections.
@@ -336,9 +352,18 @@ public T SetConnectionStatusHandler(Action<IElasticsearchResponse> handler)
336352
}
337353

338354
/// <summary>
339-
/// Basic access authorization credentials to specify with all requests.
355+
/// Basic access authentication credentials to specify with all requests.
340356
/// </summary>
357+
[Obsolete("Scheduled to be removed in 2.0. Use SetBasicAuthentication() instead.")]
341358
public T SetBasicAuthorization(string userName, string password)
359+
{
360+
return this.SetBasicAuthentication(userName, password);
361+
}
362+
363+
/// <summary>
364+
/// Basic access authentication credentials to specify with all requests.
365+
/// </summary>
366+
public T SetBasicAuthentication(string userName, string password)
342367
{
343368
if (this._basicAuthCredentials == null)
344369
this._basicAuthCredentials = new BasicAuthorizationCredentials();

0 commit comments

Comments
 (0)