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/05/30 15:08:36 UTC
[3/4] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/223' into asf-master
Merge remote-tracking branch 'remotes/parent/pr/223' into asf-master
# Conflicts:
# cayenne-gradle-plugin/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f7420763
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f7420763
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f7420763
Branch: refs/heads/master
Commit: f7420763921ef4cc1f27336c0a9ee604688c714e
Parents: cd41bec 1ef5d29
Author: Nikita Timofeev <st...@gmail.com>
Authored: Tue May 30 17:56:10 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Tue May 30 17:56:10 2017 +0300
----------------------------------------------------------------------
.travis.yml | 2 +-
build-tools/cayenne-test-utilities/pom.xml | 5 ++++
cayenne-gradle-plugin/build.gradle | 25 +++++++++++++++-----
cayenne-gradle-plugin/pom.xml | 31 +++++++++++++++++++++++--
4 files changed, 54 insertions(+), 9 deletions(-)
----------------------------------------------------------------------