Merge branch '144'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/2265e4cc Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2265e4cc Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2265e4cc Branch: refs/heads/master Commit: 2265e4cc2d5a816d07359d02ff02622ea6cbc5a6 Parents: 52acbef 04ca433 Author: Savva Kolbachev <s.kolbac...@gmail.com> Authored: Wed Nov 30 11:28:49 2016 +0300 Committer: Savva Kolbachev <s.kolbac...@gmail.com> Committed: Wed Nov 30 11:28:49 2016 +0300 ---------------------------------------------------------------------- .../org/apache/cayenne/map/EJBQLQueryDescriptor.java | 5 +---- .../apache/cayenne/map/ProcedureQueryDescriptor.java | 4 +--- .../java/org/apache/cayenne/map/QueryDescriptor.java | 14 +++++++++++--- .../org/apache/cayenne/map/SQLTemplateDescriptor.java | 4 +--- .../org/apache/cayenne/map/SelectQueryDescriptor.java | 4 +--- 5 files changed, 15 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
