Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C2DE717E96 for ; Wed, 2 Dec 2015 09:55:04 +0000 (UTC) Received: (qmail 20634 invoked by uid 500); 2 Dec 2015 09:55:04 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 20598 invoked by uid 500); 2 Dec 2015 09:55:04 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 20586 invoked by uid 99); 2 Dec 2015 09:55:04 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Dec 2015 09:55:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6B4BFE09D2; Wed, 2 Dec 2015 09:55:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.apache.org Date: Wed, 02 Dec 2015 09:55:05 -0000 Message-Id: In-Reply-To: <9ed7079ddd3d435db1c17f0d92920a2d@git.apache.org> References: <9ed7079ddd3d435db1c17f0d92920a2d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] ignite git commit: Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2 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/654bd337 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/654bd337 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/654bd337 Branch: refs/heads/ignite-843-rc2 Commit: 654bd337f9fdad1fcab6024f651f71f4729b4df7 Parents: 8cb63e0 7b1acaf Author: Andrey Authored: Wed Dec 2 16:54:58 2015 +0700 Committer: Andrey Committed: Wed Dec 2 16:54:58 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/summary-controller.js | 30 +++++--- .../main/js/helpers/generator/generator-java.js | 74 +++++++++----------- 2 files changed, 54 insertions(+), 50 deletions(-) ----------------------------------------------------------------------