Merge branch 'ignite-45' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-541
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d7c3d0a3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d7c3d0a3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d7c3d0a3 Branch: refs/heads/ignite-45 Commit: d7c3d0a316966e62f8fdf5e3467b14e27530c25d Parents: 0707af2 b9a1e83 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Fri Mar 20 17:12:32 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Fri Mar 20 17:12:32 2015 -0700 ---------------------------------------------------------------------- examples/pom-standalone.xml | 2 +- .../integration/ClientAbstractSelfTest.java | 30 ++++++++++++++------ .../ignite/cache/CacheTypeFieldMetadata.java | 7 ++++- .../apache/ignite/cache/CacheTypeMetadata.java | 6 +++- .../continuous/CacheContinuousQueryManager.java | 17 +++++++---- .../jdk/JdkMarshallerObjectInputStream.java | 4 ++- .../core/src/main/resources/ignite.properties | 2 +- ...eJdbcStoreAbstractMultithreadedSelfTest.java | 2 +- .../GridCacheOnCopyFlagAbstractSelfTest.java | 2 +- .../testframework/junits/GridAbstractTest.java | 1 - pom.xml | 2 +- 11 files changed, 52 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d7c3d0a3/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java index e97e3b8,e99874d..db088e6 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java @@@ -18,9 -18,9 +18,10 @@@ package org.apache.ignite.cache; import org.apache.ignite.internal.util.tostring.*; +import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; + import java.io.*; import java.util.*; /**
