Merge branch 'sonar-blockers'
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/06b5dec1 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/06b5dec1 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/06b5dec1 Branch: refs/heads/master Commit: 06b5dec1c4d5d2978922fce6c6293d08593b92f0 Parents: 3e41007 700694b Author: Tom Barber <[email protected]> Authored: Sat Oct 10 07:44:21 2015 +0100 Committer: Tom Barber <[email protected]> Committed: Sat Oct 10 07:44:21 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../oodt/cas/filemgr/ingest/CachedIngester.java | 8 ++++- .../oodt/cas/filemgr/ingest/StdIngester.java | 9 ++++-- .../lightweight/LightweightProfileServer.java | 22 ++++++------- .../LightweightProfileServerTest.java | 6 ++-- .../oodt/cas/pushpull/config/SiteInfo.java | 28 +++++++++++----- .../cas/pushpull/protocol/ProtocolHandler.java | 34 ++++++++++---------- .../oodt/cas/pushpull/protocol/RemoteSite.java | 23 ++++++++++--- 8 files changed, 85 insertions(+), 47 deletions(-) ----------------------------------------------------------------------
