Merge branch 'master' of github.com:elasticsearch/elasticsearch-net

Author: Mpdreamz

src/Elasticsearch.Net/Connection/Transport.cs

@@ -256,7 +256,7 @@ private Uri GetNextBaseUri<T>(TransportRequestState<T> requestState, out int ini
 		private ElasticsearchResponse<T> RetryRequest<T>(TransportRequestState<T> requestState, Uri baseUri, int retried, Exception e = null)
 		{
 			var maxRetries = this.GetMaximumRetries(requestState.RequestConfiguration);
-			var exceptionMessage = MaxRetryExceptionMessage.F(requestState.Method, requestState.Path.IsNullOrEmpty() ? "/" : "", retried);
+			var exceptionMessage = MaxRetryExceptionMessage.F(requestState.Method, requestState.Path.IsNullOrEmpty() ? "/" : requestState.Path, retried);
 
 			this._connectionPool.MarkDead(baseUri, this.ConfigurationValues.DeadTimeout, this.ConfigurationValues.MaxDeadTimeout);
 

src/Nest/Domain/Analysis/Tokenizer/UaxEmailUrlTokenizer.cs

@@ -10,7 +10,7 @@ public class UaxEmailUrlTokenizer : TokenizerBase
     {
 		public UaxEmailUrlTokenizer()
         {
-			Type = "uax_url_email ";
+			Type = "uax_url_email";
         }
 
 		/// <summary>
@@ -19,4 +19,4 @@ public UaxEmailUrlTokenizer()
 		[JsonProperty("max_token_length")]
 		public int? MaximumTokenLength { get; set; }		
     }
-}
+}

src/Nest/ElasticClient.cs

@@ -94,9 +94,7 @@ D descriptor
 			where R : BaseResponse
 		{
 			var config = descriptor.RequestConfiguration as IRequestConfiguration;
-			var statusCodeAllowed = config == null 
-				|| (config.AllowedStatusCodes.HasAny() 
-				&& config.AllowedStatusCodes.Any(i=>i==c.HttpStatusCode));
+			var statusCodeAllowed = config != null ? config.AllowedStatusCodes.Any(i => i == c.HttpStatusCode) : false;
 
 			if (c.Success || statusCodeAllowed)
 			{