Merge remote-tracking branch 'origin/ignite-164v2' into ignite-164v2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9ee52f91 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9ee52f91 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9ee52f91 Branch: refs/heads/ignite-164v2 Commit: 9ee52f9167e6c308c6751e26d227b146a46b1b2b Parents: cc9e8cc 9ef202a Author: Artem Shutak <[email protected]> Authored: Fri Feb 6 14:04:20 2015 +0300 Committer: Artem Shutak <[email protected]> Committed: Fri Feb 6 14:04:20 2015 +0300 ---------------------------------------------------------------------- .../processors/rest/JettyRestProcessorAbstractSelfTest.java | 2 +- .../ignite/internal/processors/rest/GridRestProcessor.java | 4 +++- .../processors/schedule/IgniteNoopScheduleProcessor.java | 2 +- .../main/java/org/apache/ignite/internal/util/IgniteUtils.java | 2 +- .../src/main/java/org/apache/ignite/internal/util/typedef/X.java | 2 +- .../src/main/java/org/apache/ignite/jdbc/IgniteJdbcDriver.java | 2 +- .../java/org/apache/ignite/spi/IgniteSpiManagementMBean.java | 2 +- .../src/main/java/org/apache/ignite/spi/IgniteSpiThread.java | 2 +- .../main/java/org/apache/ignite/startup/BasicWarmupClosure.java | 2 +- .../src/main/java/org/apache/ignite/thread/IgniteThread.java | 2 +- .../org/apache/ignite/testframework/junits/GridAbstractTest.java | 2 +- 11 files changed, 13 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
