You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2015/04/04 19:05:40 UTC
[34/50] [abbrv] olingo-odata4 git commit: Merge branch 'OLINGO-573'
of https://git-wip-us.apache.org/repos/asf/olingo-odata4 into OLINGO-573
Merge branch 'OLINGO-573' of https://git-wip-us.apache.org/repos/asf/olingo-odata4 into OLINGO-573
Conflicts:
lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java
lib/server-core-ext/src/main/java/org/apache/olingo/server/core/SchemaBasedEdmProvider.java
lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/bce3ca6c
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/bce3ca6c
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/bce3ca6c
Branch: refs/heads/OLINGO-549-ODataV4-JPA
Commit: bce3ca6c7caf4c52ac5edb33c95b3421d24c3093
Parents: 2b73abc 8668b09
Author: Ramesh Reddy <ra...@jboss.org>
Authored: Tue Mar 31 11:34:03 2015 -0500
Committer: Ramesh Reddy <ra...@jboss.org>
Committed: Tue Mar 31 11:34:03 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------