Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-579
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9e3557a6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9e3557a6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9e3557a6 Branch: refs/heads/ignite-497 Commit: 9e3557a6364e2ae52a536088d02789a2edc75550 Parents: 4833ec9 2871d5d Author: sboikov <sboi...@gridgain.com> Authored: Thu Mar 26 09:08:03 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Mar 26 09:08:03 2015 +0300 ---------------------------------------------------------------------- .../examples/datagrid/CacheQueryExample.java | 12 +- .../datagrid/CacheTransactionExample.java | 6 +- .../java/org/apache/ignite/IgniteCache.java | 59 +++---- .../java/org/apache/ignite/IgniteCompute.java | 161 ++++++++----------- .../org/apache/ignite/IgniteTransactions.java | 26 ++- .../apache/ignite/cache/CacheInterceptor.java | 3 +- .../apache/ignite/cache/affinity/Affinity.java | 49 ++---- .../org/apache/ignite/cluster/ClusterGroup.java | 43 +++-- .../org/apache/ignite/cluster/ClusterNode.java | 49 +++--- .../cluster/ClusterTopologyException.java | 2 +- .../ignite/internal/IgniteComponentType.java | 7 + .../discovery/GridDiscoveryManager.java | 3 +- .../processors/cache/GridCacheEntryEx.java | 1 + .../processors/cache/GridCacheMapEntry.java | 11 +- .../GridDistributedTxRemoteAdapter.java | 16 +- .../dht/atomic/GridDhtAtomicCache.java | 3 + .../distributed/near/GridNearAtomicCache.java | 2 + .../distributed/near/GridNearCacheEntry.java | 22 +-- .../distributed/near/GridNearLockFuture.java | 4 +- .../near/GridNearTxPrepareFuture.java | 2 +- .../processors/query/GridQueryProcessor.java | 15 ++ .../service/GridServiceProcessor.java | 4 +- .../processors/cache/GridCacheTestEntryEx.java | 1 + .../cache/IgniteDynamicCacheStartSelfTest.java | 33 ++++ .../ignite/messaging/GridMessagingSelfTest.java | 13 +- 25 files changed, 277 insertions(+), 270 deletions(-) ----------------------------------------------------------------------
