GitHub user mcherkasov opened a pull request: https://github.com/apache/ignite/pull/2657
Ignite 2.1.4 p2 You can merge this pull request into a Git repository by running: $ git pull https://github.com/gridgain/apache-ignite ignite-2.1.4-p2 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/ignite/pull/2657.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 #2657 ---- commit 84c7427a53a8e1712b1d0b763d7539c9cb844cb6 Author: Sergey Stronchinskiy <gurustronpub...@gmail.com> Date: 2017-07-04T11:51:25Z IGNITE-5532 .NET: Split CacheLinqTest into partial classes This closes #2226 commit 64c156e9252395504af00f09d934f36b6bc21913 Author: Igor Sapego <isap...@gridgain.com> Date: 2017-07-04T16:42:33Z IGNITE-5663: ODBC: Closing cursor do not reset prepared statement anymore commit 80c95ff79f344daf1fca3f094733a24bac2a218d Author: Igor Sapego <isap...@gridgain.com> Date: 2017-07-05T15:41:28Z IGNITE-5576: Added Compute::Run() for C++ commit 836906c89dfb880ac602046c37b3a2dba3ebdc46 Author: samaitra <saikat.mai...@gmail.com> Date: 2017-07-06T04:28:15Z IGNITE-5695 FlinkIgniteSinkSelfTest is failing due to conflicting default test timeout and default flush frequency - Fixes #2241. Signed-off-by: samaitra <saikat.mai...@gmail.com> commit 651ffc544bbc32cded55626adcd3ed4cc74f11ce Author: shroman <rsht...@yahoo.com> Date: 2017-07-06T05:00:08Z Removed unnecessary line from the comments. commit d1d6802378d874b039f775fe787f78c507661bb2 Author: devozerov <voze...@gridgain.com> Date: 2017-07-07T09:36:13Z Merge branch 'ignite-2.1' commit 45cd87fe73db117f5148ed2006f8de8d2517bbfe Author: mcherkasov <mcherka...@gridgain.com> Date: 2017-06-30T17:23:55Z IGNITE-5554 ServiceProcessor may process failed reassignments in timeout thread commit fa974286e8f066a8d6aa57519edf5ec7761be095 Author: Igor Sapego <isap...@gridgain.com> Date: 2017-07-07T13:49:15Z IGNITE-5582: Implemented Compute::Broadcast for C++ commit 01f504ff83cc77f80d37981b5c5a15b653861bbd Author: NSAmelchev <nsamelc...@gmail.com> Date: 2017-07-10T12:03:01Z IGNITE-5087 Enum comparison fails after marshal-unmarshal with BinaryMarshaller. commit ecfbc2c97464ad7da3f24afaaf1868a2d2fdb87e Author: devozerov <voze...@gridgain.com> Date: 2017-07-11T09:17:41Z Merge branch 'ignite-2.1' # Conflicts: # modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj commit 1be9b40c37efcbf332ebeeefc865c2fe864339e7 Author: sboikov <sboi...@gridgain.com> Date: 2017-07-11T09:42:54Z Exchange future cleanup, added special tasks for reassign/force rebalance. commit 8d4a0c2ca2abc17a1d54fa0d33b161531fa59b12 Author: Pavel Tupitsyn <ptupit...@apache.org> Date: 2017-07-11T09:49:16Z Merge branch 'ignite-2.1' commit bf25b5c52be044f07076c0800447230c75174db3 Author: Slava Koptilin <slava.kopti...@gmail.com> Date: 2017-07-07T12:35:33Z ignite-5562: assert statements were changed to the 'if' blocks commit e93b28488693381fcd232de93087ab8ec1d0f5bb Author: sboikov <sboi...@gridgain.com> Date: 2017-07-11T11:18:52Z ignite-5446 Only lateAffinity logic in CacheAffinitySharedManager. commit 5c363184c80f2fd8b79f1075d1eacbf9af5369a1 Author: Denis Magda <dma...@gridgain.com> Date: 2017-07-11T19:20:16Z Simplified Memory Policies Example commit b95f76f8a0a3a7e920f78f20b3d814112fc6d522 Author: sboikov <sboi...@gridgain.com> Date: 2017-07-12T05:47:04Z ignite-5727 Call TcpCommunicationSpi's discovery listener first commit 120384fca2b5f6f141207697f776d7859afa857f Author: devozerov <voze...@gridgain.com> Date: 2017-07-12T06:48:51Z Merge branch 'ignite-2.1' commit 5394bbdeff4e9fb97d3b413bf30001ede580bdd7 Author: sboikov <sboi...@gridgain.com> Date: 2017-07-13T10:30:59Z Unnecessary synchronous rollback in GridDhtTxLocal.prepareAsync commit 00c6b6c4ba00fa6577f74fc95b378737fb5a789c Author: Alexander Menshikov <sharple...@gmail.com> Date: 2017-07-13T12:24:59Z IGNITE-5567 Make benchmark Ignite.reentrantLock vs IgniteCache.lock commit 18bdfe96a1e579371108c661e3374183c58a296d Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Date: 2017-07-13T12:42:30Z Fixed NPE in tests commit 7338445ac9c1a2343fd41cdd20785de07b727796 Author: dkarachentsev <dkarachent...@gridgain.com> Date: 2017-07-13T13:00:08Z IGNITE-5597 - Fix javadoc in Affinity and AffinityFunction for REPLICATED cache. This closes #2268. commit d9ed07c67e4a4ff3a9de543cbe039ac2a48f03a0 Author: Sergey Chugunov <sergey.chugu...@gmail.com> Date: 2017-07-13T14:32:06Z Functionality of muted test is debated now commit 871d9260f3b32bed5273852dbdb74c758f73d383 Author: Sergey Chugunov <sergey.chugu...@gmail.com> Date: 2017-07-13T15:34:01Z Functionality of GridVersionSelfTest is debated now commit 2788a740c9aec88d14808d5927a346d121ad42b1 Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Date: 2017-07-14T09:23:42Z Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-2.1.3 commit 1e7e692bd4ce0fe2e092117190b59382840317a7 Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Date: 2017-07-14T09:25:08Z Merge branch 'ignite-2.1.3' of https://github.com/gridgain/apache-ignite into ignite-2.1.3 commit abe8e67e63018305cf0c2065282380b0cf9b762c Author: devozerov <voze...@gridgain.com> Date: 2017-07-14T10:22:54Z Merge branch 'ignite-2.1' commit 9fa78849c1ecc45fa56f518ad229e76725c27790 Author: Andrey V. Mashenkov <andrey.mashen...@gmail.com> Date: 2017-07-14T11:12:29Z IGNITE-4831: Add an option to disable MBeans. This closes #2265. (cherry picked from commit 7283edb) commit d5cc82cb09cf37da783c9bcfbf6743b8910ceb30 Author: Sergey Chugunov <sergey.chugu...@gmail.com> Date: 2017-07-14T11:52:09Z GridCacheAbstractNodeRestartSelfTest stopping all grids after each test to prevent subsequent test failures when one test fails or hangs commit 8f1d732fc8065e59a29bb538456194d7f4edd3e9 Author: Sergey Chugunov <sergey.chugu...@gmail.com> Date: 2017-07-14T11:52:17Z Merge branch 'ignite-2.1.3' of https://github.com/gridgain/apache-ignite into ignite-2.1.3 commit 1d75560f9f418628da7d212207267482a1ea16aa Author: devozerov <voze...@gridgain.com> Date: 2017-07-14T13:07:49Z Merge branch 'master' into ignite-2.1.3 ---- ---