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

Author: Mpdreamz

build/scripts/Releasing.fsx

@@ -103,7 +103,20 @@ type Release() =
             if (projectName.Equals("Nest", StringComparison.InvariantCultureIgnoreCase) = true)
             then
                 let nuspec = sprintf "%s/Nest.nuspec" unzippedDir
-                FileHelper.RegexReplaceInFileWithEncoding "<id>Nest</id>" "<id>NEST</id>" System.Text.Encoding.UTF8 nuspec
+                FileHelper.RegexReplaceInFileWithEncoding 
+                    "<id>Nest</id>" 
+                    "<id>NEST</id>" 
+                    System.Text.Encoding.UTF8 
+                    nuspec
+
+                // TODO: Make this more generic in limiting to major version based
+                // on the major version of the version specified.
+                FileHelper.RegexReplaceInFileWithEncoding 
+                    "<dependency id=\"Newtonsoft.Json\" version=\".*\" />" 
+                    "<dependency id=\"Newtonsoft.Json\" version=\"[8,9)\" />"  
+                    System.Text.Encoding.UTF8 
+                    nuspec
+
 
             // Include PDB for each target framework
             let frameworkDirs = (sprintf "%s/lib" unzippedDir |> directoryInfo).GetDirectories()

src/Benchmarking/project.lock.json

@@ -14,7 +14,7 @@ public Node(Uri uri)
 			this.Uri = uri.Purify();
 			this.IsAlive = true;
 			this.HoldsData = true;
-			this.MasterEligable = true;
+			this.MasterEligible = true;
 			this.IsResurrected = true;
 		}
 
@@ -26,8 +26,8 @@ public Node(Uri uri)
 		/// <summary>Indicates whether this node holds data, defaults to true when unknown/unspecified</summary>
 		public bool HoldsData { get; set; }
 
-		/// <summary>Indicates whether this node is master eligable, defaults to true when unknown/unspecified</summary>
-		public bool MasterEligable { get; set; }
+		/// <summary>Indicates whether this node is master eligible, defaults to true when unknown/unspecified</summary>
+		public bool MasterEligible { get; set; }
 
 		/// <summary>The id of the node, defaults to null when unknown/unspecified</summary>
 		public string Id { get; set; } 
@@ -68,7 +68,7 @@ public Node Clone() =>
 				Id = this.Id,
 				Name = this.Name,
 				HoldsData = this.HoldsData,
-				MasterEligable = this.MasterEligable,
+				MasterEligible = this.MasterEligible,
 				FailedAttempts = this.FailedAttempts,
 				DeadUntil = this.DeadUntil,
 				IsAlive = this.IsAlive

src/Elasticsearch.Net/ConnectionPool/Node.cs

@@ -288,7 +288,7 @@ private void ThrowBadAuthPipelineExceptionWhenNeeded<TReturn>(ElasticsearchRespo
 		public IEnumerable<Node> SniffNodes => this._connectionPool
 			.CreateView((e, n)=> { using (new Auditable(e, this.AuditTrail, this._dateTimeProvider) { Node = n }) {} })
 			.ToList()
-			.OrderBy(n => n.MasterEligable ? n.Uri.Port : int.MaxValue);
+			.OrderBy(n => n.MasterEligible ? n.Uri.Port : int.MaxValue);
 
 		public void SniffOnConnectionFailure()
 		{

src/Elasticsearch.Net/Transport/Pipeline/RequestPipeline.cs

@@ -16,7 +16,7 @@ public IEnumerable<Node> ToNodes(bool forceHttp = false)
 				{
 					Name = kv.Value.name,
 					Id = kv.Key,
-					MasterEligable = kv.Value.MasterEligable,
+					MasterEligible = kv.Value.MasterEligible,
 					HoldsData = kv.Value.HoldsData,
 				};
 		}
@@ -34,7 +34,7 @@ internal class SniffNode
 		public string build { get; set; }
 		public IDictionary<string, string> settings { get; set; }
 
-		internal bool MasterEligable => !((this.settings?.ContainsKey("node.master")).GetValueOrDefault(false) && Convert.ToBoolean(this.settings["node.master"]) == false);
+		internal bool MasterEligible => !((this.settings?.ContainsKey("node.master")).GetValueOrDefault(false) && Convert.ToBoolean(this.settings["node.master"]) == false);
 		internal bool HoldsData => !((this.settings?.ContainsKey("node.data")).GetValueOrDefault(false) && Convert.ToBoolean(this.settings["node.data"]) == false);
 	}
 

src/Elasticsearch.Net/Transport/Sniff/SniffResponse.cs

@@ -1739,7 +1739,7 @@
     "runtime.win7.System.Net.Requests/4.0.11-beta-23516": {
       "type": "package",
       "serviceable": true,
-      "sha512": "HI99nCEekL4SNvkLmpqkOE0PuEF5B6xyDcnJesdjo06BrGYH3QCvqJt2VmzBVe6hDSo6FnGOlhMvLdCUpDXiXA==",
+      "sha512": "mqWBQUhXhzkiwb+zVUuKg+wswJUsnQtZkFtz6eISw8vWNXA9i2jkzYjU3pjjIVmtdopnhle9YaS4a/w4OuWGLw==",
       "files": [
         "ref/dotnet/_._",
         "runtime.win7.System.Net.Requests.4.0.11-beta-23516.nupkg",

src/Elasticsearch.Net/project.lock.json

@@ -7,7 +7,7 @@
 namespace Nest
 {
 	[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter))]
-	public class AggregationDictionary : IsADictionary<string, IAggregationContainer>
+	public class AggregationDictionary : IsADictionaryBase<string, IAggregationContainer>
 	{
 		public AggregationDictionary() : base() { }
 		public AggregationDictionary(IDictionary<string, IAggregationContainer> container) : base(container) { }

src/Nest/Aggregations/AggregationContainer.cs

@@ -11,7 +11,7 @@ public interface INamedFiltersContainer : IIsADictionary<string, IQueryContainer
 	{
 	}
 
-	public class NamedFiltersContainer: IsADictionary<string, IQueryContainer>, INamedFiltersContainer
+	public class NamedFiltersContainer: IsADictionaryBase<string, IQueryContainer>, INamedFiltersContainer
 	{
 		public NamedFiltersContainer() : base() { }
 		public NamedFiltersContainer(IDictionary<string, IQueryContainer> container) : base(container) { }
@@ -23,7 +23,7 @@ public NamedFiltersContainer(Dictionary<string, QueryContainer> container)
 		public void Add(string name, QueryContainer filter) => BackingDictionary.Add(name, filter);
 	}
 
-	public class NamedFiltersContainerDescriptor<T> : IsADictionaryDescriptor<NamedFiltersContainerDescriptor<T>, INamedFiltersContainer, string, IQueryContainer>
+	public class NamedFiltersContainerDescriptor<T> : IsADictionaryDescriptorBase<NamedFiltersContainerDescriptor<T>, INamedFiltersContainer, string, IQueryContainer>
 		where T : class
 	{
 		public NamedFiltersContainerDescriptor() : base(new NamedFiltersContainer()) { }

src/Nest/Aggregations/Bucket/Filters/NamedFiltersContainer.cs

@@ -22,7 +22,7 @@ public SingleBucketsPath(string bucketsPath)
 
 	public interface IMultiBucketsPath : IIsADictionary<string, string>, IBucketsPath { }
 
-	public class MultiBucketsPath : IsADictionary<string, string>, IMultiBucketsPath
+	public class MultiBucketsPath : IsADictionaryBase<string, string>, IMultiBucketsPath
 	{
 		public MultiBucketsPath() : base() { }
 		public MultiBucketsPath(IDictionary<string, string> container) : base(container) { }
@@ -36,7 +36,7 @@ public MultiBucketsPath(Dictionary<string, string> container)
 	}
 
 	public class MultiBucketsPathDescriptor
-		: IsADictionaryDescriptor<MultiBucketsPathDescriptor, IMultiBucketsPath, string, string>
+		: IsADictionaryDescriptorBase<MultiBucketsPathDescriptor, IMultiBucketsPath, string, string>
 	{
 		public MultiBucketsPathDescriptor() : base(new MultiBucketsPath()) { }
 

src/Nest/Aggregations/Pipeline/BucketsPath.cs

@@ -8,7 +8,7 @@ namespace Nest
 	[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<Analyzers, string, IAnalyzer>))]
 	public interface IAnalyzers : IIsADictionary<string, IAnalyzer> { }
 
-	public class Analyzers : IsADictionary<string, IAnalyzer>, IAnalyzers
+	public class Analyzers : IsADictionaryBase<string, IAnalyzer>, IAnalyzers
 	{
 		public Analyzers() : base() { }
 		public Analyzers(IDictionary<string, IAnalyzer> container) : base(container) { }
@@ -19,7 +19,7 @@ public Analyzers(Dictionary<string, IAnalyzer> container)
 		public void Add(string name, IAnalyzer analyzer) => BackingDictionary.Add(name, analyzer);
 	}
 
-	public class AnalyzersDescriptor : IsADictionaryDescriptor<AnalyzersDescriptor, IAnalyzers, string, IAnalyzer>
+	public class AnalyzersDescriptor : IsADictionaryDescriptorBase<AnalyzersDescriptor, IAnalyzers, string, IAnalyzer>
 	{
 		public AnalyzersDescriptor() : base(new Analyzers()) { }