Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/olingo-odata4
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/7902e723 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/7902e723 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/7902e723 Branch: refs/heads/master Commit: 7902e7232e9a80718e3c871e9951b1ea8d0ea8e4 Parents: f57c9f0 3ba5cb3 Author: fmartelli <[email protected]> Authored: Thu May 22 17:05:36 2014 +0200 Committer: fmartelli <[email protected]> Committed: Thu May 22 17:05:36 2014 +0200 ---------------------------------------------------------------------- .../fit/v4/JSONFormatConformanceTestITCase.java | 332 +++++++++++++++++++ .../olingo/commons/api/format/ContentType.java | 1 - .../core/data/AbstractJsonDeserializer.java | 2 +- 3 files changed, 333 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
