Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/ea7ed4a8 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/ea7ed4a8 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/ea7ed4a8 Branch: refs/heads/develop Commit: ea7ed4a81ef43e416cc3b313f88f8741636008f8 Parents: caf9f41 2a5a661 Author: Sebastian Schaffert <[email protected]> Authored: Thu Oct 30 10:51:51 2014 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Thu Oct 30 10:51:51 2014 +0100 ---------------------------------------------------------------------- .../marmotta/client/clients/ImportClient.java | 39 +++++++++++++-- .../apache/marmotta/client/util/HTTPUtil.java | 52 ++++++++++---------- .../src/main/webapp/WEB-INF/web.xml | 7 +-- parent/pom.xml | 2 +- 4 files changed, 62 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
