You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mp...@apache.org on 2015/11/26 16:29:33 UTC
[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 <mp...@hortonworks.com>
Authored: Thu Nov 26 17:17:23 2015 +0200
Committer: Myroslav Papirkovskyy <mp...@hortonworks.com>
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) {
[2/2] ambari git commit: AMBARI-14089. Upgrade to 2.1.3 failed.
(UpgradeCatalog210). (mpapirkovskyy)
Posted by mp...@apache.org.
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/94fe1bfa
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/94fe1bfa
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/94fe1bfa
Branch: refs/heads/trunk
Commit: 94fe1bfa9d7a1c87cbae59a073660c85d1ee9ff7
Parents: b342254
Author: Myroslav Papirkovskyy <mp...@hortonworks.com>
Authored: Thu Nov 26 17:17:23 2015 +0200
Committer: Myroslav Papirkovskyy <mp...@hortonworks.com>
Committed: Thu Nov 26 17:29:12 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/94fe1bfa/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) {