Merge branches 'ignite-573' and 'sprint-2' of http://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-573
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5aa305b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5aa305b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5aa305b4 Branch: refs/heads/ignite-573 Commit: 5aa305b42c21876e90bba9d8b88adcd6fe3a2ddb Parents: 5d6cec4 2871d5d Author: anovikov <anovi...@gridgain.com> Authored: Thu Mar 26 13:47:04 2015 +0700 Committer: anovikov <anovi...@gridgain.com> Committed: Thu Mar 26 13:47:04 2015 +0700 ---------------------------------------------------------------------- .../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 +- .../discovery/GridDiscoveryManager.java | 3 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 33 ++++ 12 files changed, 208 insertions(+), 238 deletions(-) ----------------------------------------------------------------------
