Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into master-main
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1eded250 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1eded250 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1eded250 Branch: refs/heads/ignite-1093-2 Commit: 1eded2506f79a40a0e67721ff3924b7edd023179 Parents: 8438d0a afce269 Author: Denis Magda <[email protected]> Authored: Tue Sep 1 09:18:17 2015 +0300 Committer: Denis Magda <[email protected]> Committed: Tue Sep 1 09:18:17 2015 +0300 ---------------------------------------------------------------------- .../examples/datagrid/CacheQueryExample.java | 6 +- .../hibernate/HibernateL2CacheExample.java | 4 +- .../java8/datagrid/CacheAffinityExample.java | 4 +- .../java8/datagrid/CacheApiExample.java | 4 +- .../java8/datagrid/CacheAsyncApiExample.java | 4 +- .../processors/cache/GridCacheProcessor.java | 27 ++++-- .../GridDhtPartitionsExchangeFuture.java | 94 +++++++++++-------- .../cache/IgniteDynamicCacheAndNodeStop.java | 95 ++++++++++++++++++++ .../testsuites/IgniteCacheTestSuite2.java | 3 +- 9 files changed, 186 insertions(+), 55 deletions(-) ----------------------------------------------------------------------
