Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5bc99ac4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5bc99ac4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5bc99ac4 Branch: refs/heads/ignite-843-rc2 Commit: 5bc99ac4839b8603423b8abad42a77cc8e696beb Parents: ae62570 5b31c31 Author: Andrey <[email protected]> Authored: Tue Dec 15 17:26:34 2015 +0700 Committer: Andrey <[email protected]> Committed: Tue Dec 15 17:26:34 2015 +0700 ---------------------------------------------------------------------- .../ui-ace-java/ui-ace-java.controller.js | 18 ++---------------- .../ui-ace-java/ui-ace-java.directive.js | 8 ++++---- .../app/directives/ui-ace-java/ui-ace-java.jade | 13 +------------ .../main/js/helpers/generator/generator-java.js | 18 ++++++++++++++++-- .../js/helpers/generator/generator-properties.js | 11 +++++++++-- 5 files changed, 32 insertions(+), 36 deletions(-) ----------------------------------------------------------------------
