You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by aj...@apache.org on 2016/06/16 02:19:09 UTC
ambari git commit: AMBARI-17260. Remove CascadeType in
ServiceComponentHistoryEntity for ServiceComponentDesiredStateEntity (ajit)
Repository: ambari
Updated Branches:
refs/heads/branch-2.4 4a6dc160c -> 52031632c
AMBARI-17260. Remove CascadeType in ServiceComponentHistoryEntity for ServiceComponentDesiredStateEntity (ajit)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/52031632
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/52031632
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/52031632
Branch: refs/heads/branch-2.4
Commit: 52031632c034ab714aed71560e430a39ddf7f210
Parents: 4a6dc16
Author: Ajit Kumar <aj...@apache.org>
Authored: Wed Jun 15 19:16:06 2016 -0700
Committer: Ajit Kumar <aj...@apache.org>
Committed: Wed Jun 15 19:18:14 2016 -0700
----------------------------------------------------------------------
.../ambari/server/orm/entities/ServiceComponentHistoryEntity.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/52031632/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceComponentHistoryEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceComponentHistoryEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceComponentHistoryEntity.java
index e7fef71..0783d98 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceComponentHistoryEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceComponentHistoryEntity.java
@@ -57,7 +57,7 @@ public class ServiceComponentHistoryEntity {
@Column(name = "id", nullable = false, updatable = false)
private long m_id;
- @ManyToOne(optional = false, cascade = { CascadeType.MERGE })
+ @ManyToOne(optional = false)
@JoinColumn(name = "component_id", referencedColumnName = "id", nullable = false)
private ServiceComponentDesiredStateEntity m_serviceComponentDesiredStateEntity;