[OLINGO-317] Merge with current master
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/95e2d8d3 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/95e2d8d3 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/95e2d8d3 Branch: refs/heads/Olingo-317_DeSerializerRefactoring Commit: 95e2d8d33911872b606bd1da12c0fcf8271b6bb2 Parents: 66f26e5 098ed14 Author: Michael Bolz <[email protected]> Authored: Mon Jul 7 07:42:22 2014 +0200 Committer: Michael Bolz <[email protected]> Committed: Mon Jul 7 07:42:22 2014 +0200 ---------------------------------------------------------------------- .../apache/olingo/fit/tecsvc/BasicITCase.java | 14 ++++++-- .../retrieve/AbstractODataRetrieveRequest.java | 6 +--- .../retrieve/EdmMetadataRequestImpl.java | 10 ++++++ .../retrieve/v4/XMLMetadataRequestImpl.java | 24 ++++++++------ .../olingo/client/core/edm/EdmEnumTypeImpl.java | 9 +++--- lib/server-tecsvc/pom.xml | 34 ++++++++++++++++++++ 6 files changed, 76 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
