Merge remote-tracking branch 'origin/ignite-45' into ignite-45
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bd9a635e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bd9a635e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bd9a635e Branch: refs/heads/ignite-45 Commit: bd9a635e675e150d7f4f3e51923f3a1cc2dc3c0d Parents: 9a606d5 b9a1e83 Author: Dmitiry Setrakyan <dsetrak...@gridgain.com> Authored: Fri Mar 20 16:26:07 2015 -0700 Committer: Dmitiry Setrakyan <dsetrak...@gridgain.com> Committed: Fri Mar 20 16:26:07 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(-) ----------------------------------------------------------------------
