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/5efe2ba0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5efe2ba0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5efe2ba0 Branch: refs/heads/ignite-843-rc2 Commit: 5efe2ba0a21f098c60b22246d70aec062b9769b1 Parents: 12f1006 478b984 Author: Andrey <[email protected]> Authored: Fri Dec 11 11:19:54 2015 +0700 Committer: Andrey <[email protected]> Committed: Fri Dec 11 11:19:54 2015 +0700 ---------------------------------------------------------------------- .../js/helpers/generator/generator-common.js | 17 ++- .../main/js/helpers/generator/generator-java.js | 151 ++++++++++++++----- 2 files changed, 129 insertions(+), 39 deletions(-) ----------------------------------------------------------------------
