Merge remote-tracking branch 'remotes/apache-git/master' into ignite-1353
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/abadcf2b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/abadcf2b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/abadcf2b Branch: refs/heads/ignite-1353 Commit: abadcf2b2122893bca52c97e60ca05e59edc37dd Parents: 9e5708e Author: Denis Magda <[email protected]> Authored: Thu Sep 3 11:31:22 2015 +0300 Committer: Denis Magda <[email protected]> Committed: Thu Sep 3 11:31:22 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/portable/GridPortableMarshallerSelfTest.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/abadcf2b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java index 7378c22..5f2b8d1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java @@ -71,7 +71,6 @@ import sun.misc.Unsafe; import static org.apache.ignite.internal.portable.PortableThreadLocalMemoryAllocator.THREAD_LOCAL_ALLOC; import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertTrue; /** * Portable marshaller tests.
