Merge branch 'master' into jpa

Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/2164ef75
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/2164ef75
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/2164ef75

Branch: refs/heads/master
Commit: 2164ef75ca57b91c3c12a6043649dcce142b5836
Parents: e7143b5 3fe1000
Author: Martin Stockhammer <[email protected]>
Authored: Sun Oct 16 20:10:06 2016 +0200
Committer: Martin Stockhammer <[email protected]>
Committed: Sun Oct 16 20:10:06 2016 +0200

----------------------------------------------------------------------
 .../DefaultArchivaConfiguration.java            | 67 +++++++++++---------
 .../webdav/ArchivaDavResourceFactory.java       | 14 +++-
 ...epositoryServletProxiedMetadataTestCase.java | 40 ------------
 .../AbstractRepositoryServletTestCase.java      | 31 +++++++++
 .../webdav/RepositoryServletNoProxyTest.java    | 40 ++++++++++++
 5 files changed, 118 insertions(+), 74 deletions(-)
----------------------------------------------------------------------


Reply via email to