ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnettle...@apache.org
Subject ambari git commit: AMBARI-14615. Blueprints HostGroupComponentEntity primary key is incorrectly specified. (rnettleton)
Date Mon, 11 Jan 2016 22:43:48 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 72707d842 -> d1caeb75f


AMBARI-14615. Blueprints HostGroupComponentEntity primary key is incorrectly specified. (rnettleton)


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

Branch: refs/heads/branch-2.2
Commit: d1caeb75f27257a2ac7e607d5b20cd78b4517152
Parents: 72707d8
Author: Bob Nettleton <rnettleton@hortonworks.com>
Authored: Mon Jan 11 17:41:25 2016 -0500
Committer: Bob Nettleton <rnettleton@hortonworks.com>
Committed: Mon Jan 11 17:41:25 2016 -0500

----------------------------------------------------------------------
 .../ambari/server/orm/entities/HostGroupComponentEntity.java     | 1 -
 .../ambari/server/orm/entities/HostGroupComponentEntityPK.java   | 4 ----
 2 files changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/d1caeb75/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostGroupComponentEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostGroupComponentEntity.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostGroupComponentEntity.java
index 046bbd8..e917e74 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostGroupComponentEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostGroupComponentEntity.java
@@ -47,7 +47,6 @@ public class HostGroupComponentEntity {
   @Column(name = "name", nullable = false, insertable = true, updatable = false)
   private String name;
 
-  @Id
   @Column(name = "provision_action", nullable = true, insertable = true, updatable = false)
   private String provisionAction;
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d1caeb75/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostGroupComponentEntityPK.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostGroupComponentEntityPK.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostGroupComponentEntityPK.java
index 0e97346..fb9011b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostGroupComponentEntityPK.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostGroupComponentEntityPK.java
@@ -38,10 +38,6 @@ public class HostGroupComponentEntityPK {
   @Column(name = "name", nullable = false, insertable = true, updatable = false, length =
100)
   private String name;
 
-  @Id
-  @Column(name = "provision_action", nullable = true, insertable = true, updatable = false,
length = 100)
-  private String provisionAction;
-
   /**
    * Get the name of the associated host group.
    *


Mime
View raw message