Merge branch 'ignite-1.5' into ignite-2100
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ae21fa50 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ae21fa50 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ae21fa50 Branch: refs/heads/ignite-2100 Commit: ae21fa502ad81113eb998979669387fbba6eb4ec Parents: 10311a6 a50e963 Author: vozerov-gridgain <[email protected]> Authored: Mon Dec 14 16:34:07 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Mon Dec 14 16:34:07 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/gridify/AbstractAopTest.java | 32 ++--- .../ignite/internal/binary/BinaryMetadata.java | 91 ++++++++++++++- .../ignite/internal/binary/BinarySchema.java | 28 +++++ .../IgniteStartCacheInTransactionSelfTest.java | 8 ++ ...gniteTopologyValidatorAbstractCacheTest.java | 18 +-- ...iteTopologyValidatorAbstractTxCacheTest.java | 1 - .../CacheTryLockMultithreadedTest.java | 116 +++++++++++++++++++ .../IgniteBinaryObjectFieldsQuerySelfTest.java | 2 +- 8 files changed, 268 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
