Merge remote-tracking branch 'feature/cd-pipeline' into feature/netstandard-2.0
# Conflicts: # Jenkinsfile Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/7799f5a4 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/7799f5a4 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/7799f5a4 Branch: refs/heads/feature/netstandard-2.0 Commit: 7799f5a420ba9637f0ee0e1801d1e9b7a4d2028a Parents: fa9103f fec14bf Author: Dominik Psenner <[email protected]> Authored: Tue Aug 22 18:22:18 2017 +0200 Committer: Dominik Psenner <[email protected]> Committed: Tue Aug 22 18:22:18 2017 +0200 ---------------------------------------------------------------------- Jenkinsfile | 6 ++++-- tests/nant.build | 8 ++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/7799f5a4/Jenkinsfile ----------------------------------------------------------------------
