Merge remote-tracking branch 'origin/ignite-26' into ignite-26
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/67fa2ea3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/67fa2ea3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/67fa2ea3 Branch: refs/heads/ignite-138 Commit: 67fa2ea3857a04096ba8ab87cacc8df2d8ba6da7 Parents: c83c0ed 128f754 Author: sboikov <sboi...@gridgain.com> Authored: Tue Feb 3 11:15:16 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Feb 3 11:15:16 2015 +0300 ---------------------------------------------------------------------- .../src/test/java/org/apache/ignite/gridify/TestGridifyTask.java | 1 - .../src/test/java/org/apache/ignite/client/SleepTestTask.java | 3 +-- .../org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java | 1 - .../internal/processors/rest/RestBinaryProtocolSelfTest.java | 3 +-- .../org/apache/ignite/internal/processors/rest/TestTask2.java | 1 - .../main/java/org/apache/ignite/internal/util/IgniteUtils.java | 3 ++- 6 files changed, 4 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
