Merge branches 'ignite-187' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-187
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/39754fe6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/39754fe6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/39754fe6 Branch: refs/heads/sprint-2 Commit: 39754fe673142ea5d76c570adce49065c1a2b781 Parents: 5ab4591 a792c99 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Sat Feb 28 01:32:53 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Sat Feb 28 01:32:53 2015 +0700 ---------------------------------------------------------------------- .../apache/ignite/internal/GridProperties.java | 78 ------------------- .../ignite/internal/GridUpdateNotifier.java | 2 +- .../apache/ignite/internal/IgniteKernal.java | 18 ++--- .../ignite/internal/IgniteProperties.java | 79 ++++++++++++++++++++ .../ignite/internal/IgniteVersionUtils.java | 8 +- .../plugin/IgnitePluginProcessor.java | 24 ++++++ .../apache/ignite/plugin/PluginProvider.java | 5 ++ .../internal/GridUpdateNotifierSelfTest.java | 2 +- 8 files changed, 123 insertions(+), 93 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39754fe6/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39754fe6/modules/core/src/main/java/org/apache/ignite/plugin/PluginProvider.java ----------------------------------------------------------------------
