Merge remote-tracking branch 'community/ignite-2.1.2' into ignite-2.1.2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/984ab5bd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/984ab5bd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/984ab5bd Branch: refs/heads/master Commit: 984ab5bd3c08b2af9222964451acc281b92814b8 Parents: 4fc8124 99fd75d Author: sboikov <sboi...@gridgain.com> Authored: Fri Jul 7 14:43:50 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Jul 7 14:43:50 2017 +0300 ---------------------------------------------------------------------- .../pagemem/snapshot/SnapshotOperation.java | 17 +++++- .../cache/CacheAffinitySharedManager.java | 10 ++-- .../processors/cache/ClusterCachesInfo.java | 2 +- .../processors/cache/ExchangeActions.java | 34 ++++++------ .../processors/cache/GridCacheProcessor.java | 2 +- .../GridDhtPartitionsExchangeFuture.java | 2 +- .../IgniteChangeGlobalStateFailOverTest.java | 56 +++++++++++++------- .../query/h2/DmlStatementsProcessor.java | 19 +++++++ .../processors/query/h2/H2DatabaseType.java | 10 ++++ .../processors/query/h2/H2RowDescriptor.java | 13 +++++ 10 files changed, 120 insertions(+), 45 deletions(-) ----------------------------------------------------------------------