Skip to content

Commit 3d096da

Browse files
committed
Merge branch 'master' of github.com:Mpdreamz/NEST
Conflicts: src/Nest/ExposedInternals/ElasticInferrer.cs src/Nest/ExposedInternals/ElasticSerializer.cs
2 parents b59d996 + 3cb2c2b commit 3d096da

File tree

79 files changed

+2218
-776
lines changed

Some content is hidden

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

79 files changed

+2218
-776
lines changed
-418 KB
Binary file not shown.
-380 KB
Binary file not shown.
-411 KB
Binary file not shown.
-412 KB
Binary file not shown.
-386 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.

dep/Newtonsoft.Json.5.0.4/Newtonsoft.Json.5.0.4.nuspec renamed to dep/Newtonsoft.Json.5.0.8/Newtonsoft.Json.5.0.8.nuspec

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>Newtonsoft.Json</id>
5-
<version>5.0.4</version>
5+
<version>5.0.8</version>
66
<title>Json.NET</title>
77
<authors>James Newton-King</authors>
88
<owners>James Newton-King</owners>
9-
<licenseUrl>http://json.codeplex.com/license</licenseUrl>
10-
<projectUrl>http://james.newtonking.com/projects/json-net.aspx</projectUrl>
9+
<licenseUrl>https://raw.github.com/JamesNK/Newtonsoft.Json/master/LICENSE.md</licenseUrl>
10+
<projectUrl>http://james.newtonking.com/json</projectUrl>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1212
<description>Json.NET is a popular high-performance JSON framework for .NET</description>
13-
<releaseNotes />
14-
<copyright />
1513
<language>en-US</language>
1614
<tags>json</tags>
1715
<references>
430 KB
Binary file not shown.

dep/Newtonsoft.Json.5.0.4/lib/net20/Newtonsoft.Json.xml renamed to dep/Newtonsoft.Json.5.0.8/lib/net20/Newtonsoft.Json.xml

Lines changed: 204 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)