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/ca1e9b31 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ca1e9b31 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ca1e9b31 Branch: refs/heads/ignite-843 Commit: ca1e9b31aec611aa54b9721f6aa999b718c018dd Parents: cddb1d2 25d26a8 Author: Andrey <anovi...@gridgain.com> Authored: Fri Jul 31 13:01:38 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Fri Jul 31 13:01:38 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/models/caches.json | 6 +---- .../src/main/js/routes/generator/java.js | 28 +++++++++++--------- .../src/main/js/routes/generator/xml.js | 23 +++++++++------- .../src/main/js/views/includes/controls.jade | 5 ++-- 4 files changed, 33 insertions(+), 29 deletions(-) ----------------------------------------------------------------------
