Skip to content

Commit a9fcf1c

Browse files
committed
Merge branch 'develop' into feature/appdomain-warmer
Conflicts: src/Nest/ElasticClient.cs
2 parents 9a78820 + d46a4e2 commit a9fcf1c

File tree

871 files changed

+62
-2016
lines changed

Some content is hidden

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

871 files changed

+62
-2016
lines changed

src/Connections/Elasticsearch.Net.Connection.Thrift/ThriftConnection.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
using System;
22
using System.Collections.Concurrent;
33
using System.Collections.Generic;
4-
using System.Configuration;
54
using System.IO;
65
using System.Linq;
76
using System.Net.Sockets;
8-
using System.Security.Cryptography.X509Certificates;
97
using System.Text;
108
using System.Threading;
119
using System.Threading.Tasks;
1210
using Elasticsearch.Net.Connection.Configuration;
1311
using Elasticsearch.Net.Connection.Thrift.Protocol;
1412
using Elasticsearch.Net.Connection.Thrift.Transport;
15-
using Elasticsearch.Net.ConnectionPool;
16-
using Elasticsearch.Net.Providers;
1713

1814
namespace Elasticsearch.Net.Connection.Thrift
1915
{

src/Nest/ConvenienceExtensions/AliasExtensions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using System.Collections;
32
using System.Collections.Generic;
43
using System.Linq;
54
using System.Threading.Tasks;

src/Nest/ConvenienceExtensions/DeleteExtensions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Threading.Tasks;
3-
using Elasticsearch.Net;
43

54
namespace Nest
65
{

src/Nest/ConvenienceExtensions/DeleteManyExtensions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Collections.Generic;
2-
using System.Globalization;
32
using System.Linq;
43
using System.Threading.Tasks;
54

src/Nest/ConvenienceExtensions/IndexManyExtensions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Collections.Generic;
2-
using System.Globalization;
32
using System.Linq;
43
using System.Threading.Tasks;
54

src/Nest/ConvenienceExtensions/SerializerExtensions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using System.IO;
44
using System.Linq;
55
using System.Text;
6-
using Elasticsearch.Net.Serialization;
76

87
namespace Nest.SerializationExtensions
98
{

src/Nest/DSL/Aggregations/AggregationDescriptor.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Reflection;
4-
using Elasticsearch.Net;
53
using Nest.Resolvers.Converters;
64
using Newtonsoft.Json;
75

src/Nest/DSL/Aggregations/AverageAggregationDescriptor.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4-
using System.Linq.Expressions;
5-
using System.Text;
6-
using Nest.Resolvers;
74
using Nest.Resolvers.Converters;
85
using Newtonsoft.Json;
96

src/Nest/DSL/Aggregations/BucketAggregationBaseDescriptor.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4-
using Nest.Resolvers;
5-
using Newtonsoft.Json;
64

75
namespace Nest
86
{

src/Nest/DSL/Aggregations/CardinalityAggregationDescriptor.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4-
using System.Linq.Expressions;
5-
using System.Net.Configuration;
6-
using System.Text;
7-
using Nest.Resolvers;
84
using Nest.Resolvers.Converters;
95
using Newtonsoft.Json;
106

0 commit comments

Comments
 (0)