You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/01/14 06:58:16 UTC

[2/2] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-1811

Merge remote-tracking branch 'remotes/origin/master' into ignite-1811


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/969faefd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/969faefd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/969faefd

Branch: refs/heads/ignite-1811
Commit: 969faefd3ae4471a6c01c52e90fc9ecd77ba4c5f
Parents: aa948a9 7175a42
Author: sboikov <sb...@gridgain.com>
Authored: Thu Jan 14 08:57:48 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Jan 14 08:57:48 2016 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/GridComponent.java   |   5 +-
 .../ignite/internal/GridUpdateNotifier.java     | 454 ------------------
 .../apache/ignite/internal/IgniteKernal.java    | 126 +----
 .../discovery/GridDiscoveryManager.java         |   6 +-
 .../processors/cluster/ClusterProcessor.java    | 174 +++++++
 .../processors/cluster/GridUpdateNotifier.java  | 457 +++++++++++++++++++
 .../internal/GridUpdateNotifierSelfTest.java    | 137 ------
 ...UpdateNotifierPerClusterSettingSelfTest.java | 130 ++++++
 .../cluster/GridUpdateNotifierSelfTest.java     | 140 ++++++
 .../testsuites/IgniteKernalSelfTestSuite.java   |   4 +-
 10 files changed, 920 insertions(+), 713 deletions(-)
----------------------------------------------------------------------