forked from ravendb/ravendb
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '2.1' of github.com:fitzchak/ravendb into 2.1
Conflicts: Raven.Abstractions/Data/IJsonDocumentMetadata.cs Raven.Abstractions/Data/PutResult.cs Raven.Abstractions/Exceptions/ConcurrencyException.cs Raven.Client.Lightweight/Connection/HttpExtensions.cs Raven.Client.Lightweight/Shard/ShardStrategy.cs Raven.Database/DocumentDatabase.cs Raven.Database/Indexing/PrefetchingBehavior.cs Raven.Database/Storage/Esent/StorageActions/Lists.cs Raven.Database/Storage/Esent/StorageActions/MappedResults.cs Raven.Database/Storage/Esent/StorageActions/Staleness.cs Raven.Studio/Models/EditableDocumentModel.cs
- Loading branch information
Showing
664 changed files
with
45,695 additions
and
20,900 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,20 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<configuration> | ||
<runtime> | ||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
<dependentAssembly> | ||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:bcl="urn:schemas-microsoft-com:bcl"> | ||
<dependentAssembly bcl:name="System.Runtime"> | ||
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> | ||
<bindingRedirect oldVersion="0.0.0.0-2.5.11.0" newVersion="2.5.11.0" /> | ||
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" /> | ||
</dependentAssembly> | ||
<dependentAssembly> | ||
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> | ||
<bindingRedirect oldVersion="0.0.0.0-2.5.11.0" newVersion="2.5.11.0" /> | ||
</dependentAssembly> | ||
<dependentAssembly bcl:name="System.Threading.Tasks"> | ||
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> | ||
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" /> | ||
</dependentAssembly> | ||
</assemblyBinding> | ||
</runtime> | ||
</configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<packages> | ||
<package id="Microsoft.Bcl" version="1.0.11-beta" targetFramework="net40" /> | ||
<package id="Microsoft.Bcl.Async" version="1.0.12-beta" targetFramework="net40" /> | ||
<package id="Microsoft.Bcl" version="1.0.16-rc" targetFramework="net40" /> | ||
<package id="Microsoft.Bcl.Async" version="1.0.14-rc" targetFramework="net40" /> | ||
<package id="Microsoft.Bcl.Build" version="1.0.0-rc" targetFramework="net40" /> | ||
</packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,20 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<configuration> | ||
<runtime> | ||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
<dependentAssembly> | ||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:bcl="urn:schemas-microsoft-com:bcl"> | ||
<dependentAssembly bcl:name="System.Runtime"> | ||
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> | ||
<bindingRedirect oldVersion="0.0.0.0-2.5.11.0" newVersion="2.5.11.0" /> | ||
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" /> | ||
</dependentAssembly> | ||
<dependentAssembly> | ||
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> | ||
<bindingRedirect oldVersion="0.0.0.0-2.5.11.0" newVersion="2.5.11.0" /> | ||
</dependentAssembly> | ||
<dependentAssembly bcl:name="System.Threading.Tasks"> | ||
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> | ||
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" /> | ||
</dependentAssembly> | ||
</assemblyBinding> | ||
</runtime> | ||
</configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<packages> | ||
<package id="Microsoft.Bcl" version="1.0.11-beta" targetFramework="net40" /> | ||
<package id="Microsoft.Bcl.Async" version="1.0.12-beta" targetFramework="net40" /> | ||
<package id="Microsoft.Bcl" version="1.0.16-rc" targetFramework="net40" /> | ||
<package id="Microsoft.Bcl.Async" version="1.0.14-rc" targetFramework="net40" /> | ||
<package id="Microsoft.Bcl.Build" version="1.0.0-rc" targetFramework="net40" /> | ||
</packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,24 @@ | ||
<?xml version="1.0" encoding="utf-8" ?> | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<configuration> | ||
<connectionStrings> | ||
<add name="SqlExpress" providerName="System.Data.SqlClient" connectionString="Data Source=.\sqlexpress;Initial Catalog=Raven.Tests;Integrated Security=SSPI;Connection Timeout=1" /> | ||
<add name="LocalHost" providerName="System.Data.SqlClient" connectionString="Data Source=.;Initial Catalog=Raven.Tests;Integrated Security=SSPI;Connection Timeout=1" /> | ||
</connectionStrings> | ||
<runtime> | ||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
<dependentAssembly> | ||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:bcl="urn:schemas-microsoft-com:bcl"> | ||
<dependentAssembly bcl:name="System.Runtime"> | ||
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> | ||
<bindingRedirect oldVersion="0.0.0.0-2.5.11.0" newVersion="2.5.11.0" /> | ||
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" /> | ||
</dependentAssembly> | ||
<dependentAssembly> | ||
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> | ||
<bindingRedirect oldVersion="0.0.0.0-2.5.11.0" newVersion="2.5.11.0" /> | ||
</dependentAssembly> | ||
<dependentAssembly bcl:name="System.Threading.Tasks"> | ||
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> | ||
<bindingRedirect oldVersion="0.0.0.0-2.5.16.0" newVersion="2.5.16.0" /> | ||
</dependentAssembly> | ||
</assemblyBinding> | ||
</runtime> | ||
</configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,8 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<packages> | ||
<package id="Microsoft.Bcl" version="1.0.11-beta" targetFramework="net40" /> | ||
<package id="Microsoft.Bcl.Async" version="1.0.12-beta" targetFramework="net40" /> | ||
<package id="Microsoft.Bcl" version="1.0.16-rc" targetFramework="net40" /> | ||
<package id="Microsoft.Bcl.Async" version="1.0.14-rc" targetFramework="net40" /> | ||
<package id="Microsoft.Bcl.Build" version="1.0.0-rc" targetFramework="net40" /> | ||
<package id="xunit" version="1.9.1" targetFramework="net40" /> | ||
<package id="xunit.extensions" version="1.9.1" targetFramework="net40" /> | ||
</packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<packages> | ||
<package id="Microsoft.Bcl" version="1.0.11-beta" targetFramework="net40" /> | ||
<package id="Microsoft.Bcl.Async" version="1.0.12-beta" targetFramework="net40" /> | ||
<package id="Microsoft.Bcl" version="1.0.16-rc" targetFramework="net40" /> | ||
<package id="Microsoft.Bcl.Async" version="1.0.14-rc" targetFramework="net40" /> | ||
<package id="Microsoft.Bcl.Build" version="1.0.0-rc" targetFramework="net40" /> | ||
</packages> |
Oops, something went wrong.