Skip to content

Commit 3a57b78

Browse files
gmarzgmarz
committed
Merge tag '1.1.0'
1.1.0
2 parents 5f6dde3 + 026797b commit 3a57b78

File tree

1,329 files changed

+39358
-8562
lines changed

Some content is hidden

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

1,329 files changed

+39358
-8562
lines changed

‎.deployment‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[config]
2-
project = new_docs/build
2+
project = docs/build

‎.gitignore‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*.userprefs
1+
*.userprefs
22
*.local.xml
33
*.sln.docstates
44
*.obj
@@ -51,13 +51,13 @@ build/tools/*
5151
!build/*.nuspec
5252

5353
/dep/Newtonsoft.Json.4.0.2
54-
!new_docs/build
55-
new_docs/node_modules
54+
!docs/build
55+
docs/node_modules
5656
doc/Help
5757

5858
/src/Nest.Tests.Unit/*.ncrunchproject
5959
*.ncrunchproject
6060
Cache
6161
YamlCache
6262

63-
*.DS_Store
63+
*.DS_Store

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

‎build/Elasticsearch.Net.JsonNET.nuspec‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3+
<metadata>
4+
<id>Elasticsearch.Net.JsonNET</id>
5+
<version>1.1.0</version>
6+
<title>Elasticsearch.Net.JsonNET - Json.NET serializer for the low level elasticsearch client</title>
7+
<authors>Elasticsearch Inc. and contributors</authors>
8+
<owners>Elasticsearch Inc.</owners>
9+
<iconUrl>http://nest.azurewebsites.net/images/elasticsearch-net-nuget-icon.png</iconUrl>
10+
<licenseUrl>https://github.com/elasticsearch/elasticsearch-net/blob/master/license.txt</licenseUrl>
11+
<projectUrl>https://github.com/elasticsearch/elasticsearch-net</projectUrl>
12+
<summary>An IConnection implementation that utilizes Apache Thrift to talk with elasticsearch</summary>
13+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
14+
<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>
15+
<dependencies>
16+
<dependency id="Elasticsearch.Net" version="1.1.0"/>
17+
</dependencies>
18+
<tags>elasticsearch elastic search lucene thrift nest</tags>
19+
</metadata>
20+
<files>
21+
<file src="output\Elasticsearch.Net.JsonNET\Elasticsearch.Net.JsonNET.dll" target="lib"/>
22+
<file src="output\Elasticsearch.Net.JsonNET\Elasticsearch.Net.JsonNET.pdb" target="lib"/>
23+
<file src="output\Elasticsearch.Net.JsonNET\Elasticsearch.Net.JsonNET.XML" target="lib"/>
24+
</files>
25+
</package>

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

‎build/build.fsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ let buildDocs = fun action ->
140140
let node = @"build\tools\Node.js\node.exe"
141141
let wintersmith = @"..\build\tools\node_modules\wintersmith\bin\wintersmith"
142142
ExecProcess (fun p ->
143-
p.WorkingDirectory <- "new_docs"
143+
p.WorkingDirectory <- "docs"
144144
p.FileName <- node
145145
p.Arguments <- sprintf "\"%s\" %s" wintersmith action
146146
)
@@ -199,11 +199,13 @@ Target "Release" (fun _ ->
199199
nugetPack("Elasticsearch.Net")
200200
nugetPack("Elasticsearch.Net.Connection.Thrift")
201201
nugetPack("Elasticsearch.Net.Connection.HttpClient")
202+
nugetPack("Elasticsearch.Net.JsonNET")
202203
nugetPack("Nest")
203204

204205
validateSignedAssembly("Elasticsearch.Net")
205206
validateSignedAssembly("Elasticsearch.Net.Connection.Thrift")
206207
validateSignedAssembly("Elasticsearch.Net.Connection.HttpClient")
208+
validateSignedAssembly("Elasticsearch.Net.JsonNET")
207209
validateSignedAssembly("Nest")
208210
)
209211

‎dep/NetReflector.1.1.2009/NetReflector.1.1.2009.nuspec‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎dep/NetReflector.1.1.2009/lib/net20/NetReflector.dll‎

-52 KB
Binary file not shown.

0 commit comments

Comments
 (0)