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/9805e8c0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9805e8c0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9805e8c0 Branch: refs/heads/ignite-843 Commit: 9805e8c0f7bb4c14c08e8a2a6fc753bb314aed34 Parents: 2ee1c4c 3493e95 Author: Andrey <anovi...@gridgain.com> Authored: Mon Jun 8 18:36:27 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Mon Jun 8 18:36:27 2015 +0700 ---------------------------------------------------------------------- .../public/javascripts/controllers/caches.js | 10 +++--- modules/webconfig/nodejs/routes/pages.js | 5 +++ .../nodejs/views/includes/controls.jade | 2 +- .../webconfig/nodejs/views/indexedTypes.jade | 33 ++++++++++++++++++++ 4 files changed, 44 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9805e8c0/modules/webconfig/nodejs/views/includes/controls.jade ----------------------------------------------------------------------
