Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/713debb1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/713debb1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/713debb1 Branch: refs/heads/ignite-843-rc2 Commit: 713debb1332817c3333a09eb85c8b20f85dbb665 Parents: d49cbe2 2077162 Author: Andrey <anovi...@gridgain.com> Authored: Wed Dec 23 08:39:37 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Wed Dec 23 08:39:37 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/metadata-controller.js | 88 ++++++++++++-------- modules/control-center-web/src/main/js/db.js | 1 + .../main/js/helpers/generator/generator-java.js | 1 + .../main/js/helpers/generator/generator-xml.js | 1 + .../cache/VisorCacheStoreConfiguration.java | 13 ++- .../commands/cache/VisorCacheCommand.scala | 1 + .../config/benchmark-multicast.properties | 2 +- 7 files changed, 69 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
