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/f0701d3f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f0701d3f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f0701d3f Branch: refs/heads/ignite-1121 Commit: f0701d3fd71ed4c202e3f74af790486b40868624 Parents: 6acfa14 14bb9dc Author: Andrey <anovi...@gridgain.com> Authored: Mon Jul 13 16:26:46 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Mon Jul 13 16:26:46 2015 +0700 ---------------------------------------------------------------------- .../nodejs/controllers/caches-controller.js | 11 +++++++++++ .../nodejs/controllers/common-module.js | 3 +++ .../nodejs/views/includes/controls.jade | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f0701d3f/modules/web-control-center/nodejs/controllers/common-module.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f0701d3f/modules/web-control-center/nodejs/views/includes/controls.jade ----------------------------------------------------------------------
