Merge remote-tracking branch 'remotes/parent/pr/203' into asf-master
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4e268e75 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4e268e75 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4e268e75 Branch: refs/heads/master Commit: 4e268e756d4b74fa5bcf8ba5e89817b1102caf3a Parents: 0ac7dd4 a60b88f Author: Nikita Timofeev <stari...@gmail.com> Authored: Wed Apr 19 18:21:50 2017 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Wed Apr 19 18:21:50 2017 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/cayenne/map/ObjEntity.java | 7 +++++++ docs/doc/src/main/resources/RELEASE-NOTES.txt | 2 +- .../cayenne/modeler/action/RemoveAttributeAction.java | 7 +++++++ .../cayenne/modeler/editor/ObjEntityAttributePanel.java | 11 ++++------- .../org/apache/cayenne/modeler/util/ProjectUtil.java | 10 ++++++++++ 5 files changed, 29 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
