Merge remote-tracking branch 'origin/sprint-1' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/22921fc1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/22921fc1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/22921fc1 Branch: refs/heads/ignite-188 Commit: 22921fc1650c1e1ac5fb2916e5bbadb291d83af1 Parents: 68dad5b c789b6b Author: anovikov <anovi...@gridgain.com> Authored: Fri Feb 6 15:33:51 2015 +0700 Committer: anovikov <anovi...@gridgain.com> Committed: Fri Feb 6 15:33:51 2015 +0700 ---------------------------------------------------------------------- .../java/org/apache/ignite/cache/eviction/EvictableEntry.java | 2 +- .../marshaller/optimized/IgniteOptimizedObjectInputStream.java | 2 ++ .../org/apache/ignite/schema/load/AbstractSchemaLoaderTest.java | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
