Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/403d60fe Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/403d60fe Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/403d60fe Branch: refs/heads/ignite-313 Commit: 403d60feed477a4598509b619b2f63de307b9b5b Parents: 8baca04 9671471 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Mon Mar 2 17:16:40 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Mon Mar 2 17:16:40 2015 +0300 ---------------------------------------------------------------------- .../configuration/IgniteConfiguration.java | 5 +- .../org/apache/ignite/internal/IgnitionEx.java | 592 +++++++++---------- .../GridCacheQueueCleanupSelfTest.java | 1 - 3 files changed, 267 insertions(+), 331 deletions(-) ----------------------------------------------------------------------
