This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit df7e0c55198ee570017e053fe171aa9a2010fe8d Merge: 5a3a7db c3942c7 Author: Tony Chemit <chemit@codelutin.com> Date: Sun Jan 1 12:56:03 2017 +0100 Merge branch 'feature/4' into 'develop' Move an gson adapater + reduce timeout of connection to 30 seconds instead of 1 minute (Closes #4) See merge request !101 .../java/fr/ird/observe/services/rest/ObserveServiceFactoryRest.java | 2 -- .../java/fr/ird/observe/services/rest/http/ObserveRequestBuilder.java | 4 ++-- .../fr/ird/observe/services/rest/http/ObserveResponseBuilder.java | 2 +- .../java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java | 2 ++ .../java/fr/ird/observe/services/gson}/ObserveHttpErrorAdapter.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.