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/172c0baa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/172c0baa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/172c0baa Branch: refs/heads/ignite-843 Commit: 172c0baa9aa11439a6d6a438e08e66bf4e6594cc Parents: 2b403d2 a78eee5 Author: Andrey <anovi...@gridgain.com> Authored: Thu Jun 25 11:37:27 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Thu Jun 25 11:37:27 2015 +0700 ---------------------------------------------------------------------- modules/webconfig/nodejs/app.js | 20 ++-- .../nodejs/public/form-models/persistence.json | 11 +- .../public/javascripts/controllers/caches.js | 18 ++-- .../javascripts/controllers/persistence.js | 43 -------- .../javascripts/controllers/persistences.js | 107 +++++++++++++++++++ modules/webconfig/nodejs/routes/persistence.js | 91 ---------------- modules/webconfig/nodejs/routes/persistences.js | 91 ++++++++++++++++ modules/webconfig/nodejs/views/persistence.jade | 6 +- 8 files changed, 230 insertions(+), 157 deletions(-) ----------------------------------------------------------------------
