Skip to content

Commit ff3d3d7

Browse files
MpdreamzMpdreamz
committed
Merge branch 'develop' of github.com:elasticsearch/elasticsearch-net into develop
2 parents a485d68 + a7b9dc7 commit ff3d3d7

File tree

19 files changed

+39
-46
lines changed

19 files changed

+39
-46
lines changed

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

+2-2
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.0.0-ci20140604105901</version>
5+
<version>1.0.0-rc1</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.0.0-ci20140604105901"/>
16+
<dependency id="Elasticsearch.Net" version="1.0.0-rc1"/>
1717
<dependency id="NetReflector" />
1818
</dependencies>
1919
<tags>elasticsearch elastic search lucene thrift nest</tags>

‎build/Elasticsearch.Net.nuspec

+1-1
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.0.0-ci20140604105901</version>
5+
<version>1.0.0-rc1</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

+2-2
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.0.0-ci20140604105901</version>
5+
<version>1.0.0-rc1</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.0.0-ci20140604105901"/>
16+
<dependency id="Elasticsearch.Net" version="1.0.0-rc1"/>
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
1010
[assembly: AssemblyFileVersionAttribute("1.0.0")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
1010
[assembly: AssemblyFileVersionAttribute("1.0.0")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
1010
[assembly: AssemblyFileVersionAttribute("1.0.0")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
1010
[assembly: AssemblyFileVersionAttribute("1.0.0")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

‎src/Elasticsearch.Net/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
1010
[assembly: AssemblyFileVersionAttribute("1.0.0")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.0.0-ci20140710110619")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

‎src/Nest/Domain/Mapping/Descriptors/GeoPointMappingDescriptor.cs

+10-13
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,39 @@
11
using System;
22
using System.Linq.Expressions;
3-
using Nest.Resolvers;
43

54
namespace Nest
65
{
7-
public class GeoShapeMappingDescriptor<T>
6+
public class GeoPointMappingDescriptor<T>
87
{
9-
internal GeoShapeMapping _Mapping = new GeoShapeMapping();
8+
internal GeoPointMapping _Mapping = new GeoPointMapping();
109

11-
public GeoShapeMappingDescriptor<T> Name(string name)
10+
public GeoPointMappingDescriptor<T> Name(string name)
1211
{
1312
this._Mapping.Name = name;
1413
return this;
1514
}
16-
public GeoShapeMappingDescriptor<T> Name(Expression<Func<T, object>> objectPath)
15+
public GeoPointMappingDescriptor<T> Name(Expression<Func<T, object>> objectPath)
1716
{
1817
this._Mapping.Name = objectPath;
1918
return this;
2019
}
2120

22-
public GeoShapeMappingDescriptor<T> Tree(GeoTree geoTree)
21+
public GeoPointMappingDescriptor<T> IndexLatLon(bool indexLatLon = true)
2322
{
24-
this._Mapping.Tree = geoTree;
23+
this._Mapping.IndexLatLon = indexLatLon;
2524
return this;
2625
}
2726

28-
public GeoShapeMappingDescriptor<T> TreeLevels(int treeLevels)
27+
public GeoPointMappingDescriptor<T> IndexGeoHash(bool indexGeoHash = true)
2928
{
30-
this._Mapping.TreeLevels = treeLevels;
29+
this._Mapping.IndexGeoHash = indexGeoHash;
3130
return this;
3231
}
3332

34-
public GeoShapeMappingDescriptor<T> DistanceErrorPercentage(double distanceErrorPercentage)
33+
public GeoPointMappingDescriptor<T> GeoHashPrecision(int geoHashPrecision)
3534
{
36-
this._Mapping.DistanceErrorPercentage = distanceErrorPercentage;
35+
this._Mapping.GeoHashPrecision = geoHashPrecision;
3736
return this;
3837
}
39-
40-
4138
}
4239
}

‎src/Nest/Domain/Mapping/Descriptors/GeoShapeMappingDescriptor.cs

+10-14
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,39 @@
11
using System;
22
using System.Linq.Expressions;
3-
using Nest.Resolvers;
43

54
namespace Nest
65
{
7-
public class GeoPointMappingDescriptor<T>
6+
public class GeoShapeMappingDescriptor<T>
87
{
9-
internal GeoPointMapping _Mapping = new GeoPointMapping();
8+
internal GeoShapeMapping _Mapping = new GeoShapeMapping();
109

11-
public GeoPointMappingDescriptor<T> Name(string name)
10+
public GeoShapeMappingDescriptor<T> Name(string name)
1211
{
1312
this._Mapping.Name = name;
1413
return this;
1514
}
16-
public GeoPointMappingDescriptor<T> Name(Expression<Func<T, object>> objectPath)
15+
public GeoShapeMappingDescriptor<T> Name(Expression<Func<T, object>> objectPath)
1716
{
1817
this._Mapping.Name = objectPath;
1918
return this;
2019
}
2120

22-
23-
public GeoPointMappingDescriptor<T> IndexLatLon(bool indexLatLon = true)
21+
public GeoShapeMappingDescriptor<T> Tree(GeoTree geoTree)
2422
{
25-
this._Mapping.IndexLatLon = indexLatLon;
23+
this._Mapping.Tree = geoTree;
2624
return this;
2725
}
2826

29-
public GeoPointMappingDescriptor<T> IndexGeoHash(bool indexGeoHash = true)
27+
public GeoShapeMappingDescriptor<T> TreeLevels(int treeLevels)
3028
{
31-
this._Mapping.IndexGeoHash = indexGeoHash;
29+
this._Mapping.TreeLevels = treeLevels;
3230
return this;
3331
}
3432

35-
public GeoPointMappingDescriptor<T> GeoHashPrecision(int geoHashPrecision)
33+
public GeoShapeMappingDescriptor<T> DistanceErrorPercentage(double distanceErrorPercentage)
3634
{
37-
this._Mapping.GeoHashPrecision = geoHashPrecision;
35+
this._Mapping.DistanceErrorPercentage = distanceErrorPercentage;
3836
return this;
3937
}
40-
41-
4238
}
4339
}

‎src/Nest/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
1010
[assembly: AssemblyFileVersionAttribute("1.0.0")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

‎src/Profiling/Profiling.InMemoryConnection/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
1010
[assembly: AssemblyFileVersionAttribute("1.0.0")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

‎src/Profiling/Profiling.Indexing/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
1010
[assembly: AssemblyFileVersionAttribute("1.0.0")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

‎src/Serialization/Elasticsearch.Net.JsonNET/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
1010
[assembly: AssemblyFileVersionAttribute("1.0.0")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

‎src/Tests/Elasticsearch.Net.Integration.Yaml/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
1010
[assembly: AssemblyFileVersionAttribute("1.0.0")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

‎src/Tests/Elasticsearch.Net.Tests.Unit/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
1010
[assembly: AssemblyFileVersionAttribute("1.0.0")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

‎src/Tests/Nest.Tests.Integration/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
1010
[assembly: AssemblyFileVersionAttribute("1.0.0")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

‎src/Tests/Nest.Tests.MockData/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
1010
[assembly: AssemblyFileVersionAttribute("1.0.0")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

‎src/Tests/Nest.Tests.Unit/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[assembly: AssemblyConfigurationAttribute("Release")]
99
[assembly: AssemblyVersionAttribute("1.0.0")]
1010
[assembly: AssemblyFileVersionAttribute("1.0.0")]
11-
[assembly: AssemblyInformationalVersionAttribute("1.0.0-beta1")]
11+
[assembly: AssemblyInformationalVersionAttribute("1.0.0-rc1")]
1212
namespace System {
1313
internal static class AssemblyVersionInformation {
1414
internal const string Version = "1.0.0";

0 commit comments

Comments
 (0)