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

Branch: refs/heads/ignite-843
Commit: fea607cd16fec215c23608bb14dd32889d1cae2a
Parents: 2d12c9e 1585080
Author: Andrey <anovi...@gridgain.com>
Authored: Fri Jul 31 17:41:54 2015 +0700
Committer: Andrey <anovi...@gridgain.com>
Committed: Fri Jul 31 17:41:54 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/common-module.js    |  3 +-
 .../main/js/controllers/metadata-controller.js  | 61 ++++++++++++++++++++
 .../main/js/controllers/models/metadata.json    |  2 +-
 .../src/main/js/routes/generator/common.js      |  8 +++
 .../src/main/js/routes/generator/java.js        |  7 ++-
 .../src/main/js/routes/generator/xml.js         |  7 ++-
 6 files changed, 82 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


Reply via email to