Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e8a5a082 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e8a5a082 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e8a5a082 Branch: refs/heads/ignite-3478 Commit: e8a5a082026c47d40c1b6e482f5a9d83115b927a Parents: 8cf2aad 59ee8af Author: sboikov <[email protected]> Authored: Mon Oct 2 10:48:05 2017 +0300 Committer: sboikov <[email protected]> Committed: Mon Oct 2 10:48:05 2017 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 5 + .../wal/FileWriteAheadLogManager.java | 5 +- .../persistence/wal/RecordDataSerializer.java | 17 +++ .../utils/PlatformConfigurationUtils.java | 9 ++ .../db/wal/IgniteWalSerializerVersionTest.java | 104 +++++++++++++++++++ .../ignite/testsuites/IgnitePdsTestSuite2.java | 3 + modules/docker/2.2.0/Dockerfile | 46 ++++++++ modules/docker/2.2.0/run.sh | 51 +++++++++ modules/docker/Dockerfile | 4 +- .../Cache/CacheConfigurationTest.cs | 3 +- .../Cache/Query/CacheDmlQueriesTest.cs | 40 ++++++- .../Query/CacheQueriesCodeConfigurationTest.cs | 5 +- .../Cache/Query/CacheQueriesTest.cs | 11 +- .../Config/cache-query.xml | 5 + .../Config/full-config.xml | 2 +- .../IgniteConfigurationSerializerTest.cs | 7 +- .../Cache/Configuration/QueryEntity.cs | 17 +-- .../Cache/Configuration/QueryField.cs | 32 ++++++ .../Configuration/QuerySqlFieldAttribute.cs | 5 + .../IgniteConfigurationSection.xsd | 5 + modules/platforms/dotnet/docfx/index.md | 2 +- .../components/grid-item-selected/controller.js | 3 + .../frontend/app/filters/duration.filter.js | 2 +- .../app/modules/agent/AgentManager.service.js | 11 +- .../frontend/app/modules/sql/sql.controller.js | 10 +- .../frontend/app/services/Version.service.js | 6 +- modules/web-console/frontend/package.json | 2 +- .../web-agent/bin/ignite-web-agent.bat | 19 ++++ .../web-agent/bin/ignite-web-agent.sh | 5 + 29 files changed, 403 insertions(+), 33 deletions(-) ----------------------------------------------------------------------
