Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 45234200C5D for ; Fri, 7 Apr 2017 16:15:43 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 43A18160BA5; Fri, 7 Apr 2017 14:15:43 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B22F1160B97 for ; Fri, 7 Apr 2017 16:15:42 +0200 (CEST) Received: (qmail 60404 invoked by uid 500); 7 Apr 2017 14:15:41 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 60359 invoked by uid 99); 7 Apr 2017 14:15:41 -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; Fri, 07 Apr 2017 14:15:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B0B37E152F; Fri, 7 Apr 2017 14:15:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntimofeev@apache.org To: commits@cayenne.apache.org Date: Fri, 07 Apr 2017 14:15:43 -0000 Message-Id: <98e186b2efb1489fb228043d9c474f2d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/185' into asf-master archived-at: Fri, 07 Apr 2017 14:15:43 -0000 Merge remote-tracking branch 'remotes/parent/pr/185' into asf-master Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c5601933 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c5601933 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c5601933 Branch: refs/heads/master Commit: c56019336812e2ab3527b0c48c7c71bd2a94b4b0 Parents: a2c5210 5188520 Author: Nikita Timofeev Authored: Fri Apr 7 17:14:38 2017 +0300 Committer: Nikita Timofeev Committed: Fri Apr 7 17:14:38 2017 +0300 ---------------------------------------------------------------------- .../cayenne/gen/ClassGenerationAction.java | 11 ++++- .../gen/ClientClassGenerationAction.java | 17 ++++++- docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 + .../dialog/codegen/GeneratorController.java | 50 +++++++++++--------- 4 files changed, 54 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/c5601933/docs/doc/src/main/resources/RELEASE-NOTES.txt ----------------------------------------------------------------------