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/02/01 09:32:31 UTC
[3/3] olingo-odata2 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/olingo-odata2
Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/olingo-odata2
Conflicts:
odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/JPAProcessorMockAbstract.java
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/f8aa4839
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/f8aa4839
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/f8aa4839
Branch: refs/heads/master
Commit: f8aa483921ac562c44150b010a5b56574bed8ecb
Parents: 57ca646 5ea6d8c
Author: Chandan V A <ch...@sap.com>
Authored: Sun Feb 1 14:02:02 2015 +0530
Committer: Chandan V A <ch...@sap.com>
Committed: Sun Feb 1 14:02:02 2015 +0530
----------------------------------------------------------------------
.../olingo/odata2/jpa/processor/core/mock/ODataContextMock.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------