[OLINGO-695] Merge branch 'master' into OLINGO-695_OSGi-Support
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/a4288fca Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/a4288fca Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/a4288fca Branch: refs/heads/olingo712 Commit: a4288fca259ceab92dfee59cafa2d7256e646a55 Parents: 85cd907 a3fbf39 Author: Michael Bolz <[email protected]> Authored: Tue Jun 23 15:49:40 2015 +0200 Committer: Michael Bolz <[email protected]> Committed: Tue Jun 23 15:49:40 2015 +0200 ---------------------------------------------------------------------- fit/pom.xml | 2 +- .../fit/tecsvc/client/ConditionalITCase.java | 30 +++++ .../olingo/server/core/ODataDispatcher.java | 59 +++++---- .../core/etag/PreconditionsValidator.java | 49 +++----- .../processor/TechnicalEntityProcessor.java | 8 +- .../tecsvc/provider/EntityTypeProvider.java | 2 +- .../tecsvc/provider/PropertyProvider.java | 4 +- .../server/core/PreconditionsValidatorTest.java | 126 +++++++++---------- pom.xml | 1 + 9 files changed, 147 insertions(+), 134 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a4288fca/pom.xml ----------------------------------------------------------------------
