Merge remote-tracking branch 'origin/ignite-1121' into ignite-1121
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f58d8133 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f58d8133 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f58d8133 Branch: refs/heads/ignite-1155_1 Commit: f58d813307d12e6173b11ca7133a151e146f2745 Parents: 0ff3504 aa3fc51 Author: Andrey <anovi...@gridgain.com> Authored: Tue Jul 28 10:54:19 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Tue Jul 28 10:54:19 2015 +0700 ---------------------------------------------------------------------- modules/web-control-center/src/main/js/db.js | 4 +-- .../src/main/js/routes/caches.js | 2 +- .../src/main/js/routes/clusters.js | 2 +- .../src/main/js/routes/generator/xml.js | 29 +++++++++++++++++++- .../src/main/js/routes/metadata.js | 2 +- 5 files changed, 33 insertions(+), 6 deletions(-) ----------------------------------------------------------------------