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/c0662721 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c0662721 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c0662721 Branch: refs/heads/ignite-497 Commit: c06627216658a4b0a828e640e2e561922011f62e Parents: 9e3557a 4d867a4 Author: sboikov <sboi...@gridgain.com> Authored: Thu Mar 26 10:01:35 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Mar 26 10:01:35 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/Ignite.java | 59 ++++---- .../java/org/apache/ignite/IgniteCluster.java | 4 +- .../java/org/apache/ignite/IgniteEvents.java | 60 ++++---- .../java/org/apache/ignite/IgniteMessaging.java | 56 ++++---- .../java/org/apache/ignite/IgniteServices.java | 40 +++--- .../org/apache/ignite/cluster/ClusterGroup.java | 137 ++++++++++--------- .../configuration/CacheConfiguration.java | 3 - .../configuration/IgniteConfiguration.java | 32 ++--- .../org/apache/ignite/lang/IgnitePredicate.java | 3 +- .../apache/ignite/transactions/Transaction.java | 8 +- 10 files changed, 213 insertions(+), 189 deletions(-) ----------------------------------------------------------------------
