You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/08/02 09:16:58 UTC

[4/7] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/237' into asf-master

Merge remote-tracking branch 'remotes/parent/pr/237' 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/ccdaeb8b
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/ccdaeb8b
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/ccdaeb8b

Branch: refs/heads/master
Commit: ccdaeb8bd7dd7491c7ef2df7362d73293d13b6c8
Parents: f4866e5 8ed4db6
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Aug 2 11:41:41 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Aug 2 11:41:41 2017 +0300

----------------------------------------------------------------------
 .../java/org/apache/cayenne/exp/Property.java   | 42 ++++-----
 .../java/org/apache/cayenne/query/Ordering.java | 54 +++++++++--
 .../org/apache/cayenne/query/Orderings.java     | 95 ++++++++++++++++++++
 3 files changed, 158 insertions(+), 33 deletions(-)
----------------------------------------------------------------------