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 2014/05/15 19:39:07 UTC
git commit: AMBARI-5751. Ambari upgrade to Ambari-1.6.0 from
Ambari-1.5.1 logs PSQLException. (mpapirkovskyy)
Repository: ambari
Updated Branches:
refs/heads/trunk b85af30d7 -> a781a4a2e
AMBARI-5751. Ambari upgrade to Ambari-1.6.0 from Ambari-1.5.1 logs PSQLException. (mpapirkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a781a4a2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a781a4a2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a781a4a2
Branch: refs/heads/trunk
Commit: a781a4a2eafb6fceb0a0feb6541717efedd66434
Parents: b85af30
Author: Myroslav Papirkovskyy <mp...@hortonworks.com>
Authored: Thu May 15 20:06:23 2014 +0300
Committer: Myroslav Papirkovskyy <mp...@hortonworks.com>
Committed: Thu May 15 20:32:54 2014 +0300
----------------------------------------------------------------------
.../java/org/apache/ambari/server/upgrade/UpgradeCatalog160.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a781a4a2/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog160.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog160.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog160.java
index 5c91c0d..523a886 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog160.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog160.java
@@ -83,9 +83,7 @@ public class UpgradeCatalog160 extends AbstractUpgradeCatalog {
// ========================================================================
// Add constraints
dbAccessor.addFKConstraint("hostgroup_configuration", "FK_hg_config_blueprint_name",
- "blueprint_name", "hostgroup", "blueprint_name", true);
- dbAccessor.addFKConstraint("hostgroup_configuration", "FK_hg_config_hostgroup_name",
- "hostgroup_name", "hostgroup", "name", true);
+ new String[] {"blueprint_name", "hostgroup_name"}, "hostgroup", new String[] {"blueprint_name", "name"}, true);
dbAccessor.addFKConstraint("viewentity", "FK_viewentity_view_name",
new String[]{"view_name", "view_instance_name"}, "viewinstance", new String[]{"view_name", "name"}, true);