You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2014/10/14 20:35:26 UTC
[39/39] git commit: [OLINGO-129] Finished merge branch 'master' into
Olingo-129_PocJpaDataStore
[OLINGO-129] Finished merge branch 'master' into Olingo-129_PocJpaDataStore
Conflicts:
odata2-jpa-processor/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/extension/SalesOrderHeaderProcessor.java
odata2-jpa-processor/jpa-web/src/main/webapp/SalesOrderProcessingMappingModel.xml
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/b85d531b
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/b85d531b
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/b85d531b
Branch: refs/heads/Olingo-129_PocJpaDataStore
Commit: b85d531b61bf830f7a5a706729bdd882fe74f088
Parents: a6e2fbe 5a416b9
Author: mibo <mi...@mirb.de>
Authored: Tue Oct 14 20:24:26 2014 +0200
Committer: mibo <mi...@mirb.de>
Committed: Tue Oct 14 20:24:26 2014 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------