Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6b2ee50b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6b2ee50b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6b2ee50b Branch: refs/heads/ignite-1093 Commit: 6b2ee50b058e37f71ec1a0aab76454aaef87dec2 Parents: 9fe3e8f c8bc1f9 Author: vozerov-gridgain <[email protected]> Authored: Thu Aug 27 12:11:45 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Thu Aug 27 12:11:45 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/IgnitionEx.java | 23 ++++++++++++++++++-- .../testframework/junits/GridAbstractTest.java | 2 +- 2 files changed, 22 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
