Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-218
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6be185b6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6be185b6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6be185b6 Branch: refs/heads/ignite-218 Commit: 6be185b6ea7ded3df298f62732238199c0ccd0c4 Parents: 56cb251 00848cc Author: iveselovskiy <[email protected]> Authored: Mon Jun 1 12:23:19 2015 +0300 Committer: iveselovskiy <[email protected]> Committed: Mon Jun 1 12:23:19 2015 +0300 ---------------------------------------------------------------------- .../configuration/IgniteConfiguration.java | 6 +++++ .../apache/ignite/plugin/PluginProvider.java | 26 ++++++++++++++------ scripts/git-format-patch.sh | 14 +++++++---- 3 files changed, 34 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
