GitHub user AMashenkov opened a pull request: https://github.com/apache/ignite/pull/2320
Ignite 1.7.12 p1 You can merge this pull request into a Git repository by running: $ git pull https://github.com/gridgain/apache-ignite ignite-1.7.12-p1 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/ignite/pull/2320.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #2320 ---- commit b1b87036fa180df80e07db00f3674eba6089fe71 Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2016-10-31T15:26:25Z .NET: Fix ASP.NET session state provider test failures due to incorrect merge commit 8add10e2ac9a91b0d7e473e6f40ff14d650abf96 Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2016-10-31T15:26:25Z .NET: Fix ASP.NET session state provider test failures due to incorrect merge commit e00d53173e7e217f4e94388fda34ebd813c4e7c3 Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2016-10-31T15:37:49Z .NET: Fix license header commit 260f9b2d01b16a98fcb7bc721573b95a72adade2 Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2016-10-31T15:37:49Z .NET: Fix license header commit e7d7a59eff6da1cd62e8ffb64405cdf12607b49d Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2016-10-31T15:43:15Z IGNITE-4153 .NET: IgniteConfiguration.FailureDetectionTimeout property is missing commit d0f4b23600c655dfb94f6fe0205d1cca7cf19d36 Author: AKuznetsov <akuznet...@gridgain.com> Date: 2016-10-31T16:06:58Z Fixed license. commit 5fac786b6dbb179127ac725180acb54d0f6f4b0a Author: devozerov <voze...@gridgain.com> Date: 2016-10-31T18:31:05Z Merge branch 'ignite-1.6.10' into ignite-1.7.3 commit b8b9abe863ed8139553a9ad7013dfad5a363b4da Author: devozerov <voze...@gridgain.com> Date: 2016-10-31T18:31:22Z Fixes after merge. commit 61ab650ecd353b4014a30f793090e9dab3519ad5 Author: devozerov <voze...@gridgain.com> Date: 2016-10-31T18:33:59Z Fixes after merge. commit 4495efc2aa37ca31214558968fa83598317e830a Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2016-11-01T10:22:30Z IGNITE-4117 .NET: Fix ClientReconnectTask completion timing This closes #1195 commit dc0adf641f0ddac19af84ba0d701b33ee520b067 Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2016-08-16T15:11:34Z IGNITE-3368 .NET: Improve test coverage This closes #953 # Conflicts: # modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs commit cd0275d95dc6524464a154c74b1e62559b3d8af4 Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2016-08-19T14:34:00Z IGNITE-3711 .NET: Fix PlatformRawMemory coverage issue commit d7dee5248332c6c6276c9e21aed4afb3abdd4340 Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2016-07-29T12:40:42Z IGNITE-3604 .NET: Fix inconsistent namespace imports in examples Conflicts: modules/platforms/dotnet/Apache.Ignite.sln.DotSettings commit 390c8d59cf8d44d9703e5fbf8d9c0f8028a4a172 Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2016-08-11T13:18:14Z IGNITE-3675 .NET: Use separate caches for different entities in QueryExample. commit 861c1736facdf76c71e93ddada0d8e15b5b2950c Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2016-08-11T14:32:13Z IGNITE-3673 .NET: Add examples for distributed joins. commit 3a9cbed4e692e76ad884e60a4f5edc670e6b3c8f Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2016-08-08T14:00:04Z IGNITE-3630 .NET: Add pure binary mode example with put-get and queries. commit d5e15af76044cf65385672f8528d48ecdeca3cb6 Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2016-11-02T09:02:00Z IGNITE-4121 .NET: add ScanQuery example commit 74f8308d10fc011c00e52efcdb315b35cc79e60a Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2016-11-02T12:59:15Z IGNITE-4123 .NET: Remove [Serializable] from Employee in examples commit 92fff630fbf36c82f93bbd9ddd53d11bed44e772 Author: devozerov <voze...@gridgain.com> Date: 2016-11-02T14:50:51Z Restored services compatibility. commit a62a0136d295486d95c6e2ab5bba88270d831753 Author: dkarachentsev <dkarachent...@gridgain.com> Date: 2016-11-02T16:07:45Z GG-11655 - Fix merge commit 348593986b56ddfcec4a4455e49d9b279eae4dc8 Author: devozerov <voze...@gridgain.com> Date: 2016-11-05T10:28:03Z Merge branch 'ignite-1.7.3' into ignite-1.7.4 commit 175da6b7e394dd76c27d5155ff98a5b2ef03bb9d Author: tledkov-gridgain <tled...@gridgain.com> Date: 2016-11-07T06:16:58Z IGNITE-3432: check data/meta cache names are different for different IGFS instances. This closes #1201 commit ead15193899d08f41491166003cabed0560f0c59 Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2016-11-07T07:49:03Z IGNITE-4028 Get rid of OP_META in PlatformAbstractTarget This closes #1192 commit 40ef2f5ae42826fe8fd077e3013e8f55c8512bdd Author: Dmitriy Govorukhin <dgovoruk...@gridgain.com> Date: 2016-11-07T09:09:41Z ignite-4178 support permission builder commit df670c7d64046d282c053f296c47a4743c58c8b1 Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2016-11-07T09:40:00Z IGNITE-4118 .NET: Optimistic transaction example This closes #1200 commit 474f22fda4c7cf4d7b2623c451cd7c10f0d8c636 Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2016-11-07T09:55:20Z IGNITE-4119 .NET: add TransactionDeadlockException commit fc7ce5a4d72145f2e8a86debeda264ef0a5b37e3 Author: isapego <isap...@gridgain.com> Date: 2016-11-07T10:26:05Z IGNITE-4090: Added flags so stdint and limits can be used in C++. commit a98804a249496ba9bafbc96daa7aaf25b3d36724 Author: Igor Sapego <isap...@gridgain.com> Date: 2016-11-07T11:00:00Z IGNITE-4113: Added tests. Added Statement::Set/GetAttribute. commit b1c7c9bb95c900083702d0ba0362edf3aea5a7b4 Author: sboikov <sboi...@gridgain.com> Date: 2016-11-07T12:40:36Z GG-11360 - Implement SQL queries cancellation Fix for commit 80abd1b: for distributed joins need always send cancel request. commit 319014de075c80fb15e58172cc24e35ce16b56cf Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2016-11-07T14:53:40Z IGNITE-4132 .NET: Improve BinaryConfiguration documentation ---- --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---