Repository: incubator-ignite Updated Branches: refs/heads/ignite-313 4362085aa -> bc18635a9 (forced update)
Merge branches 'ignite-339' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-339 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/60e0ecb2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/60e0ecb2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/60e0ecb2 Branch: refs/heads/ignite-313 Commit: 60e0ecb2e269e6af2b0c04df2aed6f494657b03c Parents: 5d3a2be 13e2d1f Author: AKuznetsov <akuznet...@gridgain.com> Authored: Mon Mar 2 15:59:00 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Mon Mar 2 15:59:00 2015 +0700 ---------------------------------------------------------------------- .../store/CacheNodeWithStoreStartup.java | 6 +- .../store/jdbc/CacheJdbcPersonStore.java | 115 ++++++---------- .../apache/ignite/cache/store/CacheStore.java | 4 +- .../ignite/cache/store/CacheStoreAdapter.java | 2 +- .../ignite/cache/store/CacheStoreSession.java | 17 ++- .../processors/cache/GridCacheStoreManager.java | 6 +- .../ignite/internal/util/IgniteUtils.java | 90 ++++++++++-- .../spi/discovery/tcp/TcpDiscoverySpi.java | 137 +++++++++++-------- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 116 ++++++++++++++++ .../core/src/test/config/store/jdbc/Ignite.xml | 63 +++++++-- .../junits/cache/TestCacheSession.java | 5 + .../cache/TestThreadLocalCacheSession.java | 5 + .../ignite/schema/generator/XmlGenerator.java | 8 +- .../apache/ignite/schema/model/PojoField.java | 11 +- .../apache/ignite/schema/load/model/Ignite.xml | 133 +++++++++++++----- .../yardstick/config/ignite-store-config.xml | 15 +- 16 files changed, 521 insertions(+), 212 deletions(-) ----------------------------------------------------------------------
