Merge branches 'ignite-2.0' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fcc41ac4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fcc41ac4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fcc41ac4 Branch: refs/heads/ignite-5075 Commit: fcc41ac4be7c74890c948ed1d545054dda905f4d Parents: 7297e1d 6ab579c Author: Alexey Kuznetsov <akuznet...@gridgain.com> Authored: Sat Apr 29 14:51:28 2017 +0700 Committer: Alexey Kuznetsov <akuznet...@gridgain.com> Committed: Sat Apr 29 14:51:28 2017 +0700 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 36 ++++++++++++++++++++ .../org/apache/ignite/igfs/IgfsMetrics.java | 2 +- .../visor/query/VisorQueryConfiguration.java | 12 ------- .../CacheMemoryPolicyConfigurationTest.java | 12 +++++-- .../MemoryPolicyInitializationTest.java | 18 ++++++---- .../Cache/Configuration/CacheConfiguration.cs | 3 -- .../IgniteConfigurationSection.xsd | 5 --- .../commands/cache/VisorCacheCommand.scala | 1 - .../web-console/backend/app/browsersHandler.js | 4 +-- modules/web-console/backend/app/mongo.js | 3 -- .../app/modules/agent/AgentManager.service.js | 20 +++++------ .../generator/ConfigurationGenerator.js | 3 -- .../generator/PlatformGenerator.js | 3 +- .../generator/defaults/Cache.service.js | 2 -- .../generator/defaults/IGFS.service.js | 1 - .../states/configuration/caches/query.pug | 6 ---- .../modules/states/configuration/igfs/misc.pug | 2 -- .../agent/handlers/DatabaseListener.java | 24 ++++++------- pom.xml | 2 +- 19 files changed, 84 insertions(+), 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fcc41ac4/pom.xml ----------------------------------------------------------------------