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/4426dded
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4426dded
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4426dded

Branch: refs/heads/ignite-45
Commit: 4426dded5d2062277b2b775d6b2a40de8d09bcbc
Parents: 96709ce b401c0e
Author: Alexey Goncharuk <agoncha...@gridgain.com>
Authored: Tue Mar 24 00:41:49 2015 -0700
Committer: Alexey Goncharuk <agoncha...@gridgain.com>
Committed: Tue Mar 24 00:41:49 2015 -0700

----------------------------------------------------------------------
 examples/README.txt                             |   2 +-
 .../org/apache/ignite/schema/CacheConfig.java   |  12 +-
 .../java/org/apache/ignite/schema/Demo.java     |  32 +-
 .../org/apache/ignite/schema/PersonKey.java     |   7 +
 .../store/jdbc/CacheAbstractJdbcStore.java      |  36 +-
 .../processors/cache/GridCacheProcessor.java    |   2 +-
 .../core/src/test/config/store/jdbc/Ignite.xml  | 268 -------------
 .../config/store/jdbc/ignite-type-metadata.xml  | 268 +++++++++++++
 .../store/jdbc/CacheJdbcPojoStoreTest.java      |   2 +-
 ...eJdbcStoreAbstractMultithreadedSelfTest.java |   2 +-
 ...eAtomicInvalidPartitionHandlingSelfTest.java |  47 ++-
 ...tomicPrimaryWriteOrderRemoveFailureTest.java |  56 +++
 .../GridCacheAtomicRemoveFailureTest.java       |  56 +++
 .../IgniteCacheFailoverTestSuite.java           |   3 +
 .../ignite/schema/generator/CodeGenerator.java  |  32 +-
 .../schema/test/generator/XmlGeneratorTest.java |   2 +-
 .../apache/ignite/schema/test/model/Ignite.xml  | 390 -------------------
 .../schema/test/model/ignite-type-metadata.xml  | 390 +++++++++++++++++++
 18 files changed, 901 insertions(+), 706 deletions(-)
----------------------------------------------------------------------


Reply via email to