ignite-471-2: smarter merge from sprint-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4007a430 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4007a430 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4007a430 Branch: refs/heads/ignite-471-2 Commit: 4007a43030a340ced6bd4da649650dd21d66faf5 Parents: a062467 95b7147 Author: dmagda <magda7...@gmail.com> Authored: Wed Jun 10 22:23:37 2015 +0300 Committer: dmagda <magda7...@gmail.com> Committed: Wed Jun 10 22:23:37 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheProcessor.java | 2 +- .../java/org/apache/ignite/messaging/GridMessagingSelfTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4007a430/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4007a430/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java index c11aeb0,b7838be..fb4ac8c --- a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java @@@ -180,7 -184,9 +180,7 @@@ public class GridMessagingSelfTest exte /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - - ((OptimizedMarshaller)cfg.getMarshaller()).setRequireSerializable(false); -- ++ TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); discoSpi.setIpFinder(ipFinder);
