Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e188e185 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e188e185 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e188e185 Branch: refs/heads/ignite-960 Commit: e188e185679fc7b0203ba88f9e3f5ede0998da38 Parents: b84e102 cf32324 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Thu Jun 11 18:47:25 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Thu Jun 11 18:47:25 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
