You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by ni...@apache.org on 2016/12/17 10:28:45 UTC
[69/81] [abbrv] zest-java git commit: Merge remote-tracking branch
'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
buildSrc/src/main/groovy/org/apache/zest/gradle/doc/XsltTask.groovy
buildSrc/src/main/groovy/org/apache/zest/gradle/release/ModuleReleaseSpec.groovy
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/e08a8d82
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/e08a8d82
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/e08a8d82
Branch: refs/heads/develop
Commit: e08a8d8284ad2855640e9985162fd0022bc4bca9
Parents: b45402f 05439b7
Author: Niclas Hedhman <ni...@hedhman.org>
Authored: Sat Dec 17 11:26:58 2016 +0800
Committer: Niclas Hedhman <ni...@hedhman.org>
Committed: Sat Dec 17 11:26:58 2016 +0800
----------------------------------------------------------------------
buildSrc/build.gradle | 11 +-
.../org/apache/zest/gradle/doc/XsltTask.groovy | 100 ++++++++++++++++
.../gradle/release/ModuleReleaseSpec.groovy | 53 +++++++++
.../gradle/release/ModuleReleaseSpecTest.groovy | 118 +++++++++++++++++++
4 files changed, 280 insertions(+), 2 deletions(-)
----------------------------------------------------------------------