olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject [08/26] olingo-odata4 git commit: Merge branch 'OLINGO-682'
Date Wed, 10 Jun 2015 20:16:22 GMT
Merge branch 'OLINGO-682'

Conflicts:
	lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.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/9825f36d
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/9825f36d
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/9825f36d

Branch: refs/heads/OLINGO-642_OSGi-Sample
Commit: 9825f36db695ff606b174315c6797108776bd9e3
Parents: ce1f6ad ad10381
Author: Ramesh Reddy <rareddy@jboss.org>
Authored: Tue Jun 2 17:54:56 2015 -0500
Committer: Ramesh Reddy <rareddy@jboss.org>
Committed: Tue Jun 2 17:54:56 2015 -0500

----------------------------------------------------------------------
 .../olingo/server/core/serializer/json/ODataJsonSerializer.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------



Mime
View raw message