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/1b27c8c1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1b27c8c1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1b27c8c1 Branch: refs/heads/ignite-843-rc2 Commit: 1b27c8c1783791a93f0c0d5d194ea267d72fb3d4 Parents: 35d3627 16b51e5 Author: Alexey Kuznetsov <[email protected]> Authored: Fri Jan 15 16:12:50 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Fri Jan 15 16:12:50 2016 +0700 ---------------------------------------------------------------------- .../src/main/js/config/default.json | 1 + .../src/main/js/helpers/configuration-loader.js | 4 ++++ .../control-center-web/src/main/js/routes/admin.js | 6 +++--- .../control-center-web/src/main/js/routes/public.js | 16 ++++++++-------- 4 files changed, 16 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
