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/fba6e941 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/fba6e941 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/fba6e941 Branch: refs/heads/develop Commit: fba6e941b55aa46ebb1e55c69ca0f5032e1a106b Parents: fef6159 d584511 Author: Sebastian Schaffert <[email protected]> Authored: Thu Sep 25 09:58:09 2014 +0200 Committer: Sebastian Schaffert <[email protected]> Committed: Thu Sep 25 09:58:09 2014 +0200 ---------------------------------------------------------------------- .../triplestore/ContextWebService.java | 2 +- .../ldp/services/LdpBinaryStoreServiceImpl.java | 31 +++++++---- .../marmotta/platform/ldp/LdpSuiteTest.java | 2 +- .../services/LdpBinaryStoreServiceImplTest.java | 54 ++++++++++++++++++++ 4 files changed, 76 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
