GitHub user agura opened a pull request:
https://github.com/apache/ignite/pull/756
Ignite 2969 cas
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/agura/incubator-ignite ignite-2969-cas
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/ignite/pull/756.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 #756
----
commit 6e5f9f0c7d4c86773b1f0cd5c5a673acb58c86c2
Author: Denis Magda <dma...@gridgain.com>
Date: 2016-01-13T11:42:27Z
Changed year to 2016 in Copyrights
commit 02dbcfd8ed2701a4f415c8871d0b8fd08bfa0583
Author: Alexey Goncharuk <alexey.goncha...@gmail.com>
Date: 2016-01-13T13:47:32Z
IGNITE-2365 - Notify policy if swap or offheap is enabled and rebalanced
entry was not preloaded.
IGNITE-2099 - Fixing custom collections.
This closes #396
commit 86c2ba2a601e82b824cf17422683e5398a4d8c7d
Author: sboikov <sboi...@gridgain.com>
Date: 2016-01-13T15:40:08Z
ignite-2350 Pass update notifier flag in discovery data (all cluster nodes
will have the same notifier status as first cluster node)
(cherry picked from commit 7175a42)
commit e1a494df400fc37ca04e8d88d1cf20bca02607b4
Author: sboikov <sboi...@gridgain.com>
Date: 2016-01-14T11:16:33Z
Renamed fields to change fields write order (to preserve backward
compatibility).
(cherry picked from commit 2a4adf5)
commit 09f978234b6062afa1e1658d5a6439365a856aca
Author: sboikov <sboi...@gridgain.com>
Date: 2016-01-14T11:42:44Z
Merge remote-tracking branch 'origin/ignite-1.5.4' into ignite-1.5.4
commit 30043e7892d0b52dc851ce5ec79c7eb3b7cc44fb
Author: Denis Magda <dma...@gridgain.com>
Date: 2016-01-14T13:02:50Z
Added release notes
commit cc3db35925698f1670a8bf1c6a1830c0c9b51290
Author: vershov <vers...@gridgain.com>
Date: 2016-01-14T14:21:56Z
IGNITE-2032 Unwind undeploys in preloader - Fixes #369.
Signed-off-by: Alexey Goncharuk <alexey.goncha...@gmail.com>
commit a5c85ca7749ae90af2e4a29e2162713b480e40fa
Author: Valentin Kulichenko <valentin.kuliche...@gmail.com>
Date: 2016-01-15T06:58:41Z
Update notifier fixes
commit 8f32a29c5a7b28b7e1173582f4c7cef5b6d73b27
Author: Ignite Teamcity <ign...@apache.org>
Date: 2016-01-15T11:00:29Z
1.5.4-SNAPSHOT
commit 6482dc80bf9cdf7aa4f592d9266c6745211b1c4c
Author: sboikov <sboi...@gridgain.com>
Date: 2016-01-15T12:15:02Z
ignite-2386 Fixed DiscoverManager to do not increase minor topology version
if exchange is not triggered.
(cherry picked from commit d881417)
commit 4ba6574dfa8077f8de23c8c2663826f81c7fd187
Author: sboikov <sboi...@gridgain.com>
Date: 2016-01-18T15:15:04Z
ignite-1811 Optimized cache 'get' on affinity node.
(cherry picked from commit 83b2bf5e1f287dc83343945b0e47b83ee7724a8e)
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreCollectionTest.java
commit 4b31f4e66c15003cee866a6e5660257346c16c1c
Author: sboikov <sboi...@gridgain.com>
Date: 2016-01-18T15:05:37Z
ignite-1811 Optimized cache 'get' on affinity node.
(cherry picked from commit 83b2bf5)
commit 1cf14fcff58c51a628df6309f05be7f0b840d5f8
Author: Pavel Tupitsyn <ptupit...@gridgain.com>
Date: 2015-12-30T10:51:32Z
IGNITE-2228: .NET: Compute futures could be cancelled.
commit 2f292788cde807d5f1c80cf9fcb8b29cd4e5ee35
Author: Pavel Tupitsyn <ptupit...@gridgain.com>
Date: 2016-01-18T10:01:43Z
IGNITE-2228: Platform compute futures cancellation support. This closes
#394.
commit 1f5b4a3c478cdf4049af9600c7abe588c3d226fc
Author: vozerov-gridgain <voze...@gridgain.com>
Date: 2016-01-18T14:24:18Z
.NET: IgniteFutureCancelledException is marked as serializable.
commit 03148776476f21e542640c204fc97508cde916fc
Author: nikolay_tikhonov <ntikho...@gridgain.com>
Date: 2016-01-18T17:41:53Z
IGNITE-2384 Fixed "Notification missed in continuous query".
commit 612bcb6b4011f99d98c39196173ce7fa60862394
Author: sboikov <sboi...@gridgain.com>
Date: 2016-01-19T12:30:53Z
ignite-1.5.4 Pass currently written message class to MessageWriter.
commit 5ba47a03411f507d9db661f83b8fe487b77bec1a
Author: Pavel Tupitsyn <ptupit...@gridgain.com>
Date: 2016-01-20T10:48:41Z
IGNITE-2414 .NET: TestWithExpiryPolicy is split into two parts: one is
fine, another one is muted due to IGNITE-1423.
commit bfaf1a634b82bf2666c79bb8f54ce71797d9a778
Author: Denis Magda <dma...@gridgain.com>
Date: 2016-01-20T10:48:47Z
Fixed queryEntities initialization from a default config
commit d0e763cbfbf7f915c942b90901678eba4abde138
Author: Anton Vinogradov <a...@apache.org>
Date: 2016-01-20T11:51:36Z
G-10964
commit 6577f1145eb67e505d69314250534f3b51ae2780
Author: Alexey Kuznetsov <akuznet...@apache.org>
Date: 2016-01-20T14:42:04Z
Fixed Visor tasks (cherry picked from commit c77fc84).
commit e0ae5248064e22cc0537f22fc5daf24142390194
Author: Alexey Kuznetsov <akuznet...@apache.org>
Date: 2016-01-21T05:31:01Z
Fixed Visor tasks (cherry picked from commit bccd459).
commit d5a5f6aa8dc193bec4307947d7b241b3c4f1397e
Author: Alexey Kuznetsov <akuznet...@apache.org>
Date: 2016-01-21T05:40:15Z
Fixed Visor tasks.
(cherry picked from commit ba93717)
commit 0222978a64e00b015a3e0f737ba9a96c72d5f0fe
Author: sboikov <sboi...@gridgain.com>
Date: 2016-01-21T08:45:27Z
Added initialization of 'storeKeepBinary' flag for cache configurations
received on discovery.
(cherry picked from commit d2f84d1)
commit 782e7438f7e46a87382da5ca07c1e2bb69a14d79
Author: Alexey Goncharuk <alexey.goncha...@gmail.com>
Date: 2016-01-21T09:17:43Z
Init simple value type if it was not set for a cache configuration received
on discovery.
(cherry picked from commit fb0173f)
commit dc261786dea5f9af75cf8f81775c18eff8a89543
Author: sboikov <sboi...@gridgain.com>
Date: 2016-01-21T09:20:04Z
Added initialization of 'storeKeepBinary' flag for cache configurations
received on discovery.
(cherry picked from commit abe44f9)
commit a8743aa3fa8da672b79aefa375f5cefdb5467f43
Author: Alexey Kuznetsov <akuznet...@apache.org>
Date: 2016-01-21T12:02:08Z
Fixed Visor tasks (cherry picked from commit 340658d).
commit 6db5dcd65367e5f375640fabfbb5e4cbd95ec1c5
Author: Denis Magda <dma...@gridgain.com>
Date: 2016-01-21T13:13:36Z
Disallow join a cluster that have a different value for
IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID
commit 25ced4c9ee8b5cc71d36c94c09428f93757a5e1d
Author: Ignite Teamcity <ign...@apache.org>
Date: 2016-01-22T07:29:35Z
1.5.5-SNAPSHOT
commit 81e75e1c4c9919bf867b4559dafdcf37d4229328
Author: Tikhonov Nikolay <tikhonovnico...@gmail.com>
Date: 2016-01-22T10:26:33Z
Fixed conflict resolver API.
----
---
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.
---
