You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/10/20 08:08:56 UTC
[4/4] git commit: Merge branch 'MRM-813'
Merge branch 'MRM-813'
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/5b59e0b1
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/5b59e0b1
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/5b59e0b1
Branch: refs/heads/master
Commit: 5b59e0b10889d70800e52b8b6af93631c70b4d39
Parents: aa14083 69ebec8
Author: Olivier Lamy <ol...@apache.org>
Authored: Mon Oct 20 17:08:22 2014 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Mon Oct 20 17:08:22 2014 +1100
----------------------------------------------------------------------
.../archiva/proxy/model/ProxyFetchResult.java | 53 ++++++++++++++++++++
.../proxy/model/RepositoryProxyConnectors.java | 2 +-
.../proxy/DefaultRepositoryProxyConnectors.java | 8 +--
.../archiva/proxy/MetadataTransferTest.java | 21 ++++----
.../src/main/webapp/js/archiva/search.js | 2 +-
.../webapp/js/templates/archiva/search.html | 2 +-
.../archiva/webdav/ArchivaDavResource.java | 4 +-
.../webdav/ArchivaDavResourceFactory.java | 11 ++--
.../webdav/ArchivaDavResourceFactoryTest.java | 5 +-
9 files changed, 82 insertions(+), 26 deletions(-)
----------------------------------------------------------------------