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/1a71798b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1a71798b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1a71798b Branch: refs/heads/ignite-843 Commit: 1a71798b1f1d8cd70fc19592fefe0e5a5a270ba2 Parents: 3dde037 a14783a Author: Andrey <anovi...@gridgain.com> Authored: Thu Jun 11 12:06:38 2015 +0300 Committer: Andrey <anovi...@gridgain.com> Committed: Thu Jun 11 12:06:38 2015 +0300 ---------------------------------------------------------------------- modules/webconfig/nodejs/db.js | 7 ++- .../nodejs/public/form-models/caches.json | 30 +++++++++- .../public/javascripts/controllers/caches.js | 58 ++++++++++++++++---- .../nodejs/views/includes/controls.jade | 14 ++++- modules/webconfig/nodejs/views/simplePopup.jade | 4 +- 5 files changed, 96 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
