Christian Amend ef1fd77875 Merge branch 'master' into ieee ... Conflicts: fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ActionImportITCase.java lib/client-api/src/main/java/org/apache/olingo/client/api/ODataClient.java lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ClientEntitySetIterator.java lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataReader.java lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataWriter.java lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientImpl.java lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataErrorResponseChecker.java lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityCreateRequestImpl.java lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityUpdateRequestImpl.java lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataPropertyUpdateRequestImpl.java lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataDeltaRequestImpl.java lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntityRequestImpl.java lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetRequestImpl.java lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataPropertyRequestImpl.java lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataServiceDocumentRequestImpl.java lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/JsonSerializer.java lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataBinderImpl.java lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataReaderImpl.java lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataWriterImpl.java lib/client-core/src/test/java/org/apache/olingo/client/core/v4/EntitySetTest.java lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ErrorTest.java lib/client-core/src/test/java/org/apache/olingo/client/core/v4/PropertyTest.java lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ServiceDocumentTest.java lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalActionProcessor.java lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalPrimitiveComplexProcessor.java		2015-06-23 16:33:00 +02:00
..
src/main/java/org/apache/olingo/client/api	Merge branch 'master' into ieee	2015-06-23 16:33:00 +02:00
pom.xml	[OLINGO-659] FIx felix maven build warnings	2015-06-16 14:03:59 +02:00