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 2013/12/05 13:31:25 UTC
[32/52] git commit: Merge branch 'master' into
PocEdmAnnotationsExtension
Merge branch 'master' into PocEdmAnnotationsExtension
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/52693996
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/52693996
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/52693996
Branch: refs/heads/master
Commit: 526939969864e7340a29addf8832a8f0da00ec70
Parents: aeca3df d4df5cc
Author: Michael Bolz <mi...@apache.org>
Authored: Fri Nov 29 14:49:59 2013 +0100
Committer: Michael Bolz <mi...@apache.org>
Committed: Fri Nov 29 14:49:59 2013 +0100
----------------------------------------------------------------------
.../core/jpa/ODataJPAResponseBuilder.java | 7 ++---
.../core/jpa/access/data/JPAExpandCallBack.java | 28 +++++++++++---------
.../jpa-web/src/main/webapp/index.jsp | 16 +++++++++++
3 files changed, 36 insertions(+), 15 deletions(-)
----------------------------------------------------------------------