Merge branches 'ignite-187' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-187
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/40fc67aa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/40fc67aa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/40fc67aa Branch: refs/heads/sprint-2 Commit: 40fc67aa5032bd8e07fa323475e5b0336bced6f9 Parents: f34d349 c9f46c1 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Mon Mar 2 10:54:39 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Mon Mar 2 10:54:39 2015 +0700 ---------------------------------------------------------------------- .../store/jdbc/CacheJdbcPersonStore.java | 111 ++++++--------- .../apache/ignite/cache/store/CacheStore.java | 4 +- .../ignite/cache/store/CacheStoreSession.java | 9 ++ .../processors/cache/GridCacheStoreManager.java | 6 +- .../ignite/internal/util/IgniteUtils.java | 90 ++++++++++-- .../spi/discovery/tcp/TcpDiscoverySpi.java | 137 +++++++++++-------- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 116 ++++++++++++++++ .../junits/cache/TestCacheSession.java | 5 + .../cache/TestThreadLocalCacheSession.java | 5 + 9 files changed, 340 insertions(+), 143 deletions(-) ----------------------------------------------------------------------
