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/136be550
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/136be550
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/136be550

Branch: refs/heads/ignite-843
Commit: 136be55068e0490df0f731d31fd2ad465623541e
Parents: 6142cc1 7d6d404
Author: AKuznetsov <akuznet...@gridgain.com>
Authored: Sat Aug 15 10:19:24 2015 +0700
Committer: AKuznetsov <akuznet...@gridgain.com>
Committed: Sat Aug 15 10:19:24 2015 +0700

----------------------------------------------------------------------
 .../main/js/controllers/metadata-controller.js  | 113 ++++++++++++-------
 .../main/js/controllers/models/metadata.json    |  18 +--
 .../control-center-web/src/main/js/package.json |   2 +-
 .../src/main/js/routes/agent.js                 |   4 +-
 4 files changed, 79 insertions(+), 58 deletions(-)
----------------------------------------------------------------------


Reply via email to