Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 34BB0187FC for ; Thu, 26 Nov 2015 15:29:34 +0000 (UTC) Received: (qmail 31581 invoked by uid 500); 26 Nov 2015 15:29:34 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 31538 invoked by uid 500); 26 Nov 2015 15:29:34 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 31529 invoked by uid 99); 26 Nov 2015 15:29:34 -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, 26 Nov 2015 15:29:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E13DEE0B56; Thu, 26 Nov 2015 15:29:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mpapirkovskyy@apache.org To: commits@ambari.apache.org Date: Thu, 26 Nov 2015 15:29:33 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] ambari git commit: AMBARI-14089. Upgrade to 2.1.3 failed. (UpgradeCatalog210). (mpapirkovskyy) Repository: ambari Updated Branches: refs/heads/branch-2.1 bded607d5 -> 9fa6a91af refs/heads/trunk b3422548b -> 94fe1bfa9 AMBARI-14089. Upgrade to 2.1.3 failed. (UpgradeCatalog210). (mpapirkovskyy) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9fa6a91a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9fa6a91a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9fa6a91a Branch: refs/heads/branch-2.1 Commit: 9fa6a91af9a277dba0bdb7cdfef879674b519643 Parents: bded607 Author: Myroslav Papirkovskyy Authored: Thu Nov 26 17:17:23 2015 +0200 Committer: Myroslav Papirkovskyy Committed: Thu Nov 26 17:26:10 2015 +0200 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9fa6a91a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java index 233019a..2717993 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java @@ -839,7 +839,6 @@ public class UpgradeCatalog210 extends AbstractUpgradeCatalog { * @return Returns an integer with the id for the next host record to be inserted. * @throws SQLException */ - @Transactional Long populateHostsId(ResultSet resultSet) throws SQLException { Long hostId = 0L; if (resultSet != null) {