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 753B2200C84 for ; Mon, 29 May 2017 14:32:54 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 73AEC160BD6; Mon, 29 May 2017 12:32:54 +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 B0E2D160BC2 for ; Mon, 29 May 2017 14:32:53 +0200 (CEST) Received: (qmail 22086 invoked by uid 500); 29 May 2017 12:32:52 -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 22040 invoked by uid 99); 29 May 2017 12:32:52 -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; Mon, 29 May 2017 12:32:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BE2C5E01C3; Mon, 29 May 2017 12:32:52 +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: Mon, 29 May 2017 12:32:53 -0000 Message-Id: <7736109eb0254dfd903cdab991fe9d56@git.apache.org> In-Reply-To: <1f1d4a6fbc7048e39d77956d5f921967@git.apache.org> References: <1f1d4a6fbc7048e39d77956d5f921967@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/221' into asf-master archived-at: Mon, 29 May 2017 12:32:54 -0000 Merge remote-tracking branch 'remotes/parent/pr/221' 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/32fd7357 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/32fd7357 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/32fd7357 Branch: refs/heads/master Commit: 32fd73575c4c1c0597bdfd128799e05694f5aa72 Parents: c299812 b7f1724 Author: Nikita Timofeev Authored: Mon May 29 15:31:23 2017 +0300 Committer: Nikita Timofeev Committed: Mon May 29 15:31:23 2017 +0300 ---------------------------------------------------------------------- .../dialog/WarningDialogByDbTargetChange.java | 86 ++++++++++++++++++++ .../dbentity/DbRelationshipTableModel.java | 12 +-- .../cayenne/modeler/util/ProjectUtil.java | 46 +++++++++++ 3 files changed, 139 insertions(+), 5 deletions(-) ----------------------------------------------------------------------