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


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/0c15673b
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/0c15673b
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/0c15673b

Branch: refs/heads/master
Commit: 0c15673b9743635bbaf9dc436e0eb65606469026
Parents: acc5b5c 6e2ddfb
Author: fmartelli <[email protected]>
Authored: Tue Jul 22 13:06:43 2014 +0200
Committer: fmartelli <[email protected]>
Committed: Tue Jul 22 13:06:43 2014 +0200

----------------------------------------------------------------------
 dist/android-lib/pom.xml                        |  10 +-
 .../src/main/assembly/lib-assembly.xml          |  30 +-
 ext/client-android/pom.xml                      | 128 ++++
 .../android/http/AndroidHttpClientFactory.java  |  44 ++
 .../src/main/resources/META-INF/LICENSE         | 670 +++++++++++++++++++
 ext/client-core-android/pom.xml                 | 130 ----
 .../android/http/AndroidHttpClientFactory.java  |  44 --
 .../src/main/resources/META-INF/LICENSE         | 670 -------------------
 ext/client-proxy-android/pom.xml                | 132 ----
 .../src/main/resources/META-INF/LICENSE         | 670 -------------------
 .../TransactionalPersistenceManagerImpl.java    |  30 +-
 ext/pom.xml                                     |   3 +-
 .../header/ODataErrorResponseChecker.java       |  46 +-
 .../request/AbstractODataRequest.java           |  16 +-
 .../communication/request/AbstractRequest.java  |  24 +-
 .../cud/ODataEntityUpdateRequestImpl.java       |   9 +-
 .../response/AbstractODataResponse.java         |   3 +-
 pom.xml                                         |  19 +-
 18 files changed, 944 insertions(+), 1734 deletions(-)
----------------------------------------------------------------------


Reply via email to