Merge remote-tracking branch 'remotes/parent/pr/185' 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/c5601933 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c5601933 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c5601933 Branch: refs/heads/master Commit: c56019336812e2ab3527b0c48c7c71bd2a94b4b0 Parents: a2c5210 5188520 Author: Nikita Timofeev <stari...@gmail.com> Authored: Fri Apr 7 17:14:38 2017 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Fri Apr 7 17:14:38 2017 +0300 ---------------------------------------------------------------------- .../cayenne/gen/ClassGenerationAction.java | 11 ++++- .../gen/ClientClassGenerationAction.java | 17 ++++++- docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 + .../dialog/codegen/GeneratorController.java | 50 +++++++++++--------- 4 files changed, 54 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/c5601933/docs/doc/src/main/resources/RELEASE-NOTES.txt ----------------------------------------------------------------------
