Merge branch 'ignite-2.1'

Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8d4a0c2c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8d4a0c2c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8d4a0c2c

Branch: refs/heads/master
Commit: 8d4a0c2ca2abc17a1d54fa0d33b161531fa59b12
Parents: 1be9b40 e786beb
Author: Pavel Tupitsyn <ptupit...@apache.org>
Authored: Tue Jul 11 12:49:16 2017 +0300
Committer: Pavel Tupitsyn <ptupit...@apache.org>
Committed: Tue Jul 11 12:49:16 2017 +0300

----------------------------------------------------------------------
 .../persistence/pagemem/PageMemoryImpl.java     | 86 ++++++++------------
 .../cache/persistence/wal/FileInput.java        |  3 +
 .../utils/PlatformConfigurationUtils.java       |  4 -
 .../Cache/Query/CacheQueriesTest.cs             |  6 ++
 .../Config/cache-query.xml                      |  1 -
 .../IgniteConfigurationSerializerTest.cs        |  2 -
 .../IgniteConfigurationTest.cs                  |  3 +-
 .../Apache.Ignite.Core/IgniteConfiguration.cs   | 11 +--
 8 files changed, 47 insertions(+), 69 deletions(-)
----------------------------------------------------------------------


Reply via email to