Merge branch 'OLINGO-573' of https://git-wip-us.apache.org/repos/asf/olingo-odata4 into OLINGO-573

Browse Source

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

...

This commit is contained in:

Ramesh Reddy 2015-03-31 11:34:03 -05:00

parent 2b73abcce0 8668b09719

commit bce3ca6c7c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available