Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c50535db Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c50535db Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c50535db Branch: refs/heads/ignite-843 Commit: c50535dbf6a051a0985ebdd39bb4507a1b665203 Parents: fb0f317 903e234 Author: Andrey <anovi...@gridgain.com> Authored: Thu Aug 20 13:21:21 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Thu Aug 20 13:21:21 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/clusters-controller.js | 35 +----- .../src/main/js/controllers/common-module.js | 52 ++++++++- .../main/js/controllers/metadata-controller.js | 112 ++++++++++--------- .../js/views/configuration/metadata-load.jade | 17 ++- .../src/main/js/views/includes/controls.jade | 4 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 2 +- 6 files changed, 128 insertions(+), 94 deletions(-) ----------------------------------------------------------------------
