Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4230ab0a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4230ab0a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4230ab0a Branch: refs/heads/ignite-1537 Commit: 4230ab0a5f98832c656f054ebb391cb4fb8313cc Parents: 730efda ab8ba97 Author: sboikov <sboi...@gridgain.com> Authored: Wed Dec 16 08:53:17 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Dec 16 08:53:17 2015 +0300 ---------------------------------------------------------------------- .../store/auto/CacheBinaryAutoStoreExample.java | 9 +- .../examples/ScalarSnowflakeSchemaExample.scala | 31 ++- .../src/main/java/org/apache/ignite/Ignite.java | 19 ++ .../java/org/apache/ignite/IgniteCache.java | 8 +- .../org/apache/ignite/binary/BinaryObject.java | 15 ++ .../store/jdbc/CacheAbstractJdbcStore.java | 2 +- .../configuration/CacheConfiguration.java | 19 +- .../internal/binary/BinaryEnumObjectImpl.java | 7 + .../internal/binary/BinaryObjectExImpl.java | 7 + .../binary/BinaryObjectOffheapImpl.java | 7 + .../processors/cache/GridCacheProcessor.java | 4 +- .../cache/store/CacheOsStoreManager.java | 2 +- ...IgniteCacheBinaryEntryProcessorSelfTest.java | 255 +++++++++++++++++++ .../GridCacheBinaryStoreAbstractSelfTest.java | 2 +- .../BinaryTxCacheLocalEntriesSelfTest.java | 2 +- .../native-client-test-cache-parallel-store.xml | 2 +- .../Config/native-client-test-cache-store.xml | 6 +- .../scala/org/apache/ignite/scalar/scalar.scala | 11 +- 18 files changed, 370 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
