Merge remote-tracking branch 'origin/ignite-843-rc1' into ignite-843-rc1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8c176b43 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8c176b43 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8c176b43 Branch: refs/heads/ignite-843-rc1 Commit: 8c176b43785db675535795d3307a0249386d6895 Parents: 6cae5c5 58bc598 Author: Andrey <[email protected]> Authored: Fri Oct 16 17:10:32 2015 +0700 Committer: Andrey <[email protected]> Committed: Fri Oct 16 17:10:32 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/common-module.js | 105 +++++++++++++++---- .../main/js/controllers/metadata-controller.js | 77 ++++++++------ .../src/main/js/controllers/sql-controller.js | 2 +- .../src/main/js/routes/agent.js | 6 ++ .../js/views/configuration/metadata-load.jade | 2 + .../main/js/views/templates/agent-download.jade | 3 +- 6 files changed, 138 insertions(+), 57 deletions(-) ----------------------------------------------------------------------
