ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rle...@apache.org
Subject ambari git commit: AMBARI-18725. Ambari Database Check failed to Complete Error (rlevas)
Date Tue, 01 Nov 2016 16:38:03 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 d0de088e3 -> db618b29c


AMBARI-18725. Ambari Database Check failed to Complete Error (rlevas)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/db618b29
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/db618b29
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/db618b29

Branch: refs/heads/branch-2.4
Commit: db618b29c10c3f6384e5ed410e2c37fc89078d47
Parents: d0de088
Author: Robert Levas <rlevas@hortonworks.com>
Authored: Tue Nov 1 12:37:53 2016 -0400
Committer: Robert Levas <rlevas@hortonworks.com>
Committed: Tue Nov 1 12:37:53 2016 -0400

----------------------------------------------------------------------
 ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql   | 2 +-
 .../src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql  | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/db618b29/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
index dd0cce6..a586333 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
@@ -1334,7 +1334,7 @@ INSERT INTO permission_roleauthorization(permission_id, authorization_id)
   SELECT permission_id, 'CLUSTER.TOGGLE_ALERTS' FROM adminpermission WHERE permission_name='CLUSTER.ADMINISTRATOR'
UNION ALL
   SELECT permission_id, 'CLUSTER.TOGGLE_KERBEROS' FROM adminpermission WHERE permission_name='CLUSTER.ADMINISTRATOR'
UNION ALL
   SELECT permission_id, 'CLUSTER.UPGRADE_DOWNGRADE_STACK' FROM adminpermission WHERE permission_name='CLUSTER.ADMINISTRATOR'
UNION ALL
-  SELECT permission_id, 'CLUSTER.MANAGE_USER_PERSISTED_DATA' FROM adminpermission WHERE permission_name='CLUSTER.ADMINISTRATOR'
UNION ALL;
+  SELECT permission_id, 'CLUSTER.MANAGE_USER_PERSISTED_DATA' FROM adminpermission WHERE permission_name='CLUSTER.ADMINISTRATOR'
UNION ALL
   SELECT permission_id, 'CLUSTER.RUN_CUSTOM_COMMAND' FROM adminpermission WHERE permission_name='CLUSTER.ADMINISTRATOR';
 
 -- Set authorizations for Administrator role

http://git-wip-us.apache.org/repos/asf/ambari/blob/db618b29/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
index 5b9315f..dcfd793 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
@@ -1268,11 +1268,6 @@ INSERT INTO ambari.adminprincipaltype (principal_type_id, principal_type_name)
V
 
 INSERT INTO ambari.adminprincipal (principal_id, principal_type_id) VALUES
   (1, 1),
-  (2, 3),
-  (3, 4),
-  (4, 5),
-  (5, 6),
-  (6, 7),
   (7, 8),
   (8, 8),
   (9, 8),


Mime
View raw message