Merge branches 'ignite-145' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-145
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/af83714b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/af83714b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/af83714b Branch: refs/heads/ignite-181 Commit: af83714bd14cd018c26f43ed34dd4389d2c51fb4 Parents: 84e7ba8 a4f0e7d Author: AKuznetsov <akuznet...@gridgain.com> Authored: Sat Feb 7 22:53:39 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Sat Feb 7 22:53:39 2015 +0700 ---------------------------------------------------------------------- .../plugin/IgnitePluginProcessor.java | 2 +- .../org/apache/ignite/plugin/Extension.java | 25 +++++++++++++++ .../apache/ignite/plugin/ExtensionRegistry.java | 32 ++++++++++++++++++++ .../apache/ignite/plugin/IgniteExtension.java | 25 --------------- .../ignite/plugin/IgniteExtensionRegistry.java | 32 -------------------- .../apache/ignite/plugin/PluginProvider.java | 2 +- .../communication/MessageCallback.java | 2 +- .../extensions/discovery/DiscoveryCallback.java | 2 +- 8 files changed, 61 insertions(+), 61 deletions(-) ----------------------------------------------------------------------
