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 2020B200BCB for ; Thu, 24 Nov 2016 15:47:16 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 1E9C6160B1F; Thu, 24 Nov 2016 14:47:16 +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 6F057160B1E for ; Thu, 24 Nov 2016 15:47:15 +0100 (CET) Received: (qmail 8714 invoked by uid 500); 24 Nov 2016 14:47:14 -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 8672 invoked by uid 99); 24 Nov 2016 14:47:14 -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; Thu, 24 Nov 2016 14:47:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 756C8DFB6F; Thu, 24 Nov 2016 14:47:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: skolbachev@apache.org To: commits@cayenne.apache.org Date: Thu, 24 Nov 2016 14:47:15 -0000 Message-Id: <4e255ed5b3724ba4a5d760cfbf2c88dd@git.apache.org> In-Reply-To: <90d950331cd943c6b83fc9a952b97134@git.apache.org> References: <90d950331cd943c6b83fc9a952b97134@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cayenne git commit: Merge branch '140' archived-at: Thu, 24 Nov 2016 14:47:16 -0000 Merge branch '140' Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/00b8d320 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/00b8d320 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/00b8d320 Branch: refs/heads/master Commit: 00b8d32046a68c6880e1c55f998d0e162fa9a809 Parents: ac1c8c5 7cfd286 Author: Savva Kolbachev Authored: Thu Nov 24 17:46:56 2016 +0300 Committer: Savva Kolbachev Committed: Thu Nov 24 17:46:56 2016 +0300 ---------------------------------------------------------------------- .../project/upgrade/v8/UpgradeHandler_V8.java | 3 +++ .../java/org/apache/cayenne/map/MapLoader.java | 8 ++++-- .../cayenne/map/QueryDescriptorLoader.java | 26 ++++++++++++++++++++ docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 + 4 files changed, 36 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/00b8d320/docs/doc/src/main/resources/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --cc docs/doc/src/main/resources/RELEASE-NOTES.txt index 3eddba9,de69496..7898cc9 --- a/docs/doc/src/main/resources/RELEASE-NOTES.txt +++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt @@@ -69,7 -69,7 +69,8 @@@ CAY-2131 Modeler NullPointerException i CAY-2138 NVARCHAR, LONGNVARCHAR and NCLOB types are missing from Firebird types.xml CAY-2143 NPE in BaseSchemaUpdateStrategy CAY-2144 cdbimport always fails for databases which don't support catalogs + CAY-2148 Failure upgrading from 3.1 to M4 +CAY-2150 UI bug: PK generation custom sequence is getting reset ---------------------------------- Release: 4.0.M3