cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntimof...@apache.org
Subject [2/2] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/207' into asf-master
Date Fri, 05 May 2017 11:55:59 GMT
Merge remote-tracking branch 'remotes/parent/pr/207' into asf-master

# Conflicts:
#	docs/doc/src/main/resources/RELEASE-NOTES.txt


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

Branch: refs/heads/master
Commit: d65baae37c54683156abe23f095777bc13270d84
Parents: 1c73a04 93414be
Author: Nikita Timofeev <stariy95@gmail.com>
Authored: Fri May 5 14:55:16 2017 +0300
Committer: Nikita Timofeev <stariy95@gmail.com>
Committed: Fri May 5 14:55:16 2017 +0300

----------------------------------------------------------------------
 docs/doc/src/main/resources/RELEASE-NOTES.txt        |  1 +
 .../dbentity/DbEntityAttributeRelationshipTab.java   | 15 ++++++++++++---
 .../cayenne/modeler/editor/dbentity/DbEntityTab.java | 11 ++++++++++-
 3 files changed, 23 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/d65baae3/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc docs/doc/src/main/resources/RELEASE-NOTES.txt
index b9967ca,88c620e..2f6541d
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@@ -35,7 -35,7 +35,8 @@@ CAY-2274 Modeler: Validate case when de
  CAY-2277 Create ClientRuntime with ClientRuntimeBuilder just like ServerRuntime
  CAY-2278 Extract cayenne-postcommit module from cayenne-lifecycle
  CAY-2280 Switch from commons-logging to slf4j
+ CAY-2295 "Sync ObjEntity with DbEntity" and "View related DbEntity" buttons aren't disabled,
if DbEntity doesn't have ObjEntity
 +CAY-2296 cayenne-crypto: Get java type for DbAttribute bound to ObjAttributes with the same
type
  
  Bug Fixes:
  


Mime
View raw message