Merge remote-tracking branch 'remotes/origin/ignite-843' 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/aa3fc51c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aa3fc51c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aa3fc51c

Branch: refs/heads/ignite-1121
Commit: aa3fc51cca5b11154b1f4312a29e2b3181553910
Parents: 3e8a935 ee6fa09
Author: sevdokimov <sevdoki...@gridgain.com>
Authored: Mon Jul 27 14:14:21 2015 +0300
Committer: sevdokimov <sevdoki...@gridgain.com>
Committed: Mon Jul 27 14:14:21 2015 +0300

----------------------------------------------------------------------
 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(-)
----------------------------------------------------------------------


Reply via email to