Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
44,501 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

714 Commits

Author SHA1 Message Date
Jan Steemann 99a057703e remove useless semicolons 2016-10-26 16:39:34 +02:00
Frank Celler 30eb92d52c switch to vst instead of vpp 2016-10-23 00:46:30 +02:00
Jan Steemann 7ee2940ceb remove cmake option -DUSE_ROCKSDB 2016-10-18 11:14:04 +02:00
Andreas Streichardt e75b8f5503 Implement cURL based inter server communication 2016-10-10 14:56:04 +02:00
Wilfried Goesgens 4e66b0075e MSC_VER is an integer 2016-10-10 13:03:48 +02:00
Wilfried Goesgens 7d2123cf68 fix compilation on windows broken by 4e8fc9b665 2016-10-10 12:56:17 +02:00
servusoft 4e8fc9b665 Update Version.cpp 
remove duble-space
 2016-10-10 10:55:53 +02:00
servusoft 2297dcdb25 extend the compiler type with compiler-version 2016-10-10 10:51:45 +02:00
Frank Celler f83f6a7114 more authentication events, fixed changePassword 2016-10-03 19:54:54 +02:00
Frank Celler 4cebbf985b changed dir structure 2016-09-09 15:08:48 +02:00
Frank Celler eed90fc588 fixed cppcheck warnings 2016-09-09 15:08:48 +02:00
jsteemann e08a2d0258 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-09 10:50:45 +02:00
jsteemann c4ca7ae2b5 make version details queryable via db._version() 2016-09-09 10:50:21 +02:00
Jan Christoph Uhde f4994993da fix return value with optional 2016-09-09 00:06:34 +02:00
Michael Hackstein d7b4ad5797 Fixed compile warning 2016-09-08 17:15:35 +02:00
Jan Christoph Uhde fc57c4809b Merge branch 'generic-col-types' of github.com:arangodb/arangodb into obi-velocystream 
* 'generic-col-types' of github.com:arangodb/arangodb: (168 commits)
  fix memleak
  Fixed shutdown of Traversal Blocks in Cluster
  restructuring agent wakeup
  remove visibility
  Traverser engine now unlocks all it's shards
  handle 0 values
  added HTTP REST APIs for online loglevel adjustments:
  move json-utilities to the place where it is solely used
  too verbose messages from cluster.js
  unify exception debugging
  Improved shutdown process of Graph Traverser Engines. This state causes a double free. Merge commit.
  silenced cppcheck warning
  silenced cppcheck warning
  silenced warning in maintainer-mode
  allow inline suppression
  give more debug info
  cosmetics
  properly free EngineInfo
  fix memleak
  fix some leaks
  ...
 2016-09-08 16:00:43 +02:00
Jan Christoph Uhde b560d15b72 prepare to send multiple chunks and do compression 2016-09-08 15:59:33 +02:00
jsteemann cb3d2eb6b9 Merge branch 'obi-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-08 13:58:36 +02:00
Jan Christoph Uhde b2762d6553 fix fullurl for vpp 2016-09-08 09:57:50 +02:00
jsteemann a495dc9835 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 18:04:57 +02:00
Frank Celler 4cb7a787b1 added optional source directory 2016-09-07 17:00:00 +02:00
Jan Christoph Uhde 7dc75a5b62 velocypack now tries to send more than one payload 2016-09-07 14:55:12 +02:00
Jan Christoph Uhde 8db47d507c Merge branch 'obi-velocystream' of github.com:arangodb/arangodb into obi-velocystream 
* 'obi-velocystream' of github.com:arangodb/arangodb:
  Remove _cookies
 2016-09-07 14:43:39 +02:00
Jan Christoph Uhde 99f592bae1 fix add multiple payloads for VppMessageNoOwnBuffer 2016-09-07 14:42:51 +02:00
Andreas Streichardt 695cf466e4 Remove _cookies 2016-09-07 14:35:13 +02:00
jsteemann 4e9028b883 removed unused member that triggered a compile error in clang 2016-09-07 14:32:41 +02:00
Jan Christoph Uhde d0fdfa727a Merge branch 'generic-col-types' of github.com:arangodb/arangodb into obi-velocystream 
* 'generic-col-types' of github.com:arangodb/arangodb:
  Improve version handling in ClusterInfo.
  Add further logging where a bug is likely.
  make error message unambiguous

Conflicts:
	lib/Rest/HttpResponse.cpp
 2016-09-05 16:42:41 +02:00
Jan Christoph Uhde cbd8ce615a make use of requested content type 2016-09-05 15:32:56 +02:00
Max Neunhoeffer ea82514b5e Merge branch 'generic-col-types' of ssh://github.com/ArangoDB/ArangoDB into generic-col-types 2016-09-05 14:07:00 +02:00
Max Neunhoeffer 6da79bf031 Merge branch 'generic-col-types' of ssh://github.com/ArangoDB/ArangoDB into generic-col-types 2016-09-05 14:06:54 +02:00
jsteemann f573f188dc Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-05 14:02:57 +02:00
Max Neunhoeffer 2543091b7c Add further logging where a bug is likely. 2016-09-05 14:00:25 +02:00
Jan Christoph Uhde a53554dcd4 Merge remote-tracking branch 'origin/generic-col-types' into obi-velocystream 
* origin/generic-col-types: (124 commits)
  fixed invalid read
  fixed index creation & validation
  Added missing classes
  micro optimizations
  Added a try catch in loadPlan. If the agency for some reason contains invalid collection information the coordinator will not break down, instead it will ignore the invalid collection and continue.
  looks good for dangling creation of shards
  respond with proper error message in case queue is full
  fix invalid check
  fixed figures() call
  half way through unassumed leadership
  prealloc _readBuffer
  fixed compile warning
  work less on the heap
  removed unused error codes
  removed TRI_collection_t
  removed bug into failedserver
  Create apps directory before starting the instance.
  Add instance info & port sniffing template
  fixed issue #2034
  privatized some members
  ...

Conflicts:
	lib/Rest/HttpResponse.cpp
 2016-09-05 13:29:39 +02:00
Jan Christoph Uhde 7ffa6ae9db fix invalid pointer 2016-09-05 12:12:29 +02:00
Jan Christoph Uhde dd500d9b9f fix warning 2016-09-05 12:07:42 +02:00
jsteemann 62718e0962 fixed invalid read 2016-09-05 12:03:43 +02:00
jsteemann df808cd665 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-05 11:51:09 +02:00
jsteemann 5e9cb5c852 removed unused error codes 2016-09-02 15:36:59 +02:00
Jan Christoph Uhde ee10949dcf fix cursor test for vpp 2016-09-01 12:12:28 +02:00
Jan Christoph Uhde 5092c08e6d fix requests where nobody is available 2016-09-01 11:28:46 +02:00
Jan Christoph Uhde 59ad47d717 make more efficient use of setPayload 2016-08-31 18:22:13 +02:00
Jan Christoph Uhde f09bf540bc change setPayload and add requested ContentType in response 2016-08-31 14:32:04 +02:00
Andreas Streichardt a14935aca3 Handle 503 answer from dbservers properly 2016-08-31 11:24:23 +02:00
jsteemann c8ee419a80 fix calls 2016-08-31 11:23:48 +02:00
Jan Christoph Uhde d6a1f45b1b Merge branch 'obi-velocystream' into obi-velocystream-stupid 
* obi-velocystream: (34 commits)
  add flags only for gcc as they are meaningless for clang
  update my scripts
  renamed method
  fixed some tests
  fix RestExportHandler
  fix: RestcursorHandler
  minor fixes
  fix effect that on second install we will complain about mismatching passwords
  only test for cleaning up 3rdparty if we're parametrized to do so.
  add vpack version of cursor.dump()
  fix CMake so it finds the PythonInterpreter even with oder versions
  hexify corrupted markers
  Fix comments
  fixed cluster start
  some preparation work for response generalization
  removed obsolete comment
  use Buffer.append() instead of memcpy
  issue #2022: double max allowed request body size, cap --batch-size value in arangoimp
  fixed issue #2023: added replicationFactor to docs
  improve the perf script
  ...

Conflicts:
	lib/Rest/GeneralResponse.cpp
	lib/Rest/GeneralResponse.h
 2016-08-31 11:21:27 +02:00
jsteemann 5964ffce78 fixed some tests 2016-08-30 09:36:43 +02:00
Jan Christoph Uhde d8be2b4079 fix: RestcursorHandler 2016-08-29 20:33:37 +02:00
Jan Christoph Uhde 656ceb873d add vpack version of cursor.dump() 2016-08-29 14:20:42 +02:00
jsteemann ae52fa028d use Buffer.append() instead of memcpy 2016-08-29 10:06:46 +02:00
Jan Christoph Uhde bc09a69c72 optimization that skips the body of addPayload used in http case 
tests - fail
 2016-08-27 03:07:48 +02:00
Jan Christoph Uhde c31b93647a try to fix RestCursorHandler 2016-08-27 02:01:18 +02:00
Jan Christoph Uhde 3d26df27a0 prepare the fixing of resthandlers 2016-08-27 00:27:07 +02:00
Jan Christoph Uhde 2ba4901b86 fist changes to get request agents working 2016-08-25 13:28:19 +02:00
Jan Christoph Uhde c64ebd6660 fix missing return in control path 2016-08-25 10:36:12 +02:00
Jan Christoph Uhde c67f45a9ce fix adding to array (without keys:) 2016-08-24 16:31:08 +02:00
Jan Christoph Uhde ca433a92fd VPP Header is now and Array instead of Object 2016-08-24 15:51:44 +02:00
Jan Christoph Uhde f9feb14a6e Revert "Merge branch 'obi-velocystream-attribute-translator' into obi-velocystream" 
This reverts commit 76679e1636, reversing
changes made to 5be5030983.

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
 2016-08-24 15:26:49 +02:00
Jan Christoph Uhde e0d914fcc1 Revert "add options to Slice::get and use them for VPackHeader" 
This reverts commit b2f99adaaa.
 2016-08-24 15:11:22 +02:00
Jan Christoph Uhde 76679e1636 Merge branch 'obi-velocystream-attribute-translator' into obi-velocystream 
* obi-velocystream-attribute-translator:
  add options to Slice::get and use them for VPackHeader
  add translator to VelocyPackHelper and headerOption to Vpp Protocol

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
	lib/Rest/CommonDefines.h
 2016-08-24 09:18:35 +02:00
Jan Christoph Uhde 0184399ba7 clean up - remove enumToEnum magic 2016-08-23 15:58:50 +02:00
Jan Christoph Uhde 1febeadfd7 finish ResponseCode enum 2016-08-23 15:46:42 +02:00
Jan Christoph Uhde a6f5fc97de finish ProtocolVersion, ProtocolType and ConnectionType 2016-08-23 15:36:36 +02:00
Jan Christoph Uhde 4873a9be71 finish ContentType enum 2016-08-23 15:02:55 +02:00
Jan Christoph Uhde 140b8dc802 preapre move of ContentTypes 2016-08-23 14:55:34 +02:00
Jan Christoph Uhde d3654d99d8 finish RequestType enum 2016-08-23 14:49:29 +02:00
Jan Christoph Uhde ed60eca896 prepare replacement of request types 2016-08-23 14:31:22 +02:00
Jan Christoph Uhde b2f99adaaa add options to Slice::get and use them for VPackHeader 2016-08-23 13:44:10 +02:00
Jan Christoph Uhde 8f5e6f65d6 add translator to VelocyPackHelper and headerOption to Vpp Protocol 2016-08-23 13:05:50 +02:00
Jan Christoph Uhde 86f887db92 even more error messages 2016-08-23 09:33:03 +02:00
Jan Christoph Uhde e2d41278af slightly better error messages 2016-08-22 09:18:35 +02:00
Mark 3bd5c27c0c changes for Visual Studio 2016-08-19 17:22:57 +02:00
Jan Christoph Uhde e1e7e2da0b Merge remote-tracking branch 'origin/engine-vs-velocystream' into obi-velocystream-merge 
* origin/engine-vs-velocystream: (91 commits)
  removed useless include
  removed JsonParser
  removed JsonHelper
  Fixed another failed nullptr handling in LogicalCollection cluster case.
  Fixed undefined behaviour in rest error creation
  Implemented updated of LogicalCollectionInfo. Right now this is only used in Cluster Mode
  agency startup changed to bootstrapping
  Mention howto control core files on linux.
  shutdown fixed
  Removed create / drop system collection from Cluster test. This is forbidden now
  The logical colleciton now knows it's journalSize
  Fixed a bug in collectionNameResolver. It now returns cid 0 for not found collections in cluster again.
  pushing corrected unittest script and cluster startup scripts
  adjusting startup scripts
  missing source file added
  we have a bootstrapping agency
  votes are processed correctly again
  Add module.context.createDocumentationRouter
  Don't implicitely build the windows packages.
  remove debug print
  ...

Conflicts:
	arangod/Cluster/ClusterComm.cpp
	arangod/GeneralServer/VppCommTask.h
	arangod/RestHandler/RestBaseHandler.cpp
	lib/Rest/VppRequest.h
 2016-08-19 14:35:05 +02:00
Jan Christoph Uhde 5a236bbade fix number of payloads 2016-08-19 13:52:46 +02:00
Michael Hackstein 96f11c7e9f Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-19 12:26:07 +02:00
jsteemann 6580131731 Merge branch 'readcache' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-19 12:19:05 +02:00
jsteemann c5f151da5c Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-19 11:01:15 +02:00
Jan Christoph Uhde 61cb8f561f Merge remote-tracking branch 'origin/obi-velocystream-frank' into obi-velocystream 
* origin/obi-velocystream-frank:
  fixed ownership of handler

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
 2016-08-19 09:58:27 +02:00
Jan Christoph Uhde 9ba13e757c prepare response for multiple velocypacks 2016-08-19 09:38:35 +02:00
Frank Celler aed99f6b53 fixed ownership of handler 2016-08-18 23:06:36 +02:00
Wilfried Goesgens dadd9833d1 Implement detection whether we are in a git repo and use the toplevel source dir. 2016-08-18 17:53:47 +02:00
Michael Hackstein 54fa504cc2 Fixed compile warning 2016-08-18 12:38:58 +02:00
Jan Christoph Uhde 4d80deebbf Merge remote-tracking branch 'origin/obi-velocystream' into obi-velocystream-test 
* origin/obi-velocystream:
  must lower case header keys
 2016-08-18 11:45:04 +02:00
Jan Christoph Uhde e5794ac583 enable handling of multiple vpacks in a message 2016-08-18 11:44:03 +02:00
jsteemann ca60690b66 must lower case header keys 2016-08-18 09:01:16 +02:00
Jan Christoph Uhde 3fb68c632d handleSimpleError now respects messageId 2016-08-17 13:22:31 +02:00
Jan Christoph Uhde 21a9f64538 remove: _request from CommTask and contentType from setPayload() 2016-08-17 09:29:23 +02:00
Jan Christoph Uhde dfb9e3ae0c Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into obi-velocystream 
* 'engine-vs-velocystream' of github.com:arangodb/arangodb: (71 commits)
  jslint
  finally fixed some nasty bugs after refactoring
  jslint
  Update README.md
  execute ternary operator in C++ as well
  added libs
  added libs
  added build
  upgraded to boost 1.61.0
  Tweak Aardvark's SUPPORT > Documentation tab
  Docs: Data model -> Data models, note that NOT_NULL() is equal to SQL's COALESCE()
  Correct HTTP docs about user parameters
  generated files
  Fix testing
  Proper roles of servers
  Streamline agency testing
  Fix if
  Fix testing
  Improve clusterawareness in foxx and foxx queues
  Add test because of keysorting bugfix
  ...
 2016-08-15 15:18:54 +02:00
Jan Christoph Uhde 21144a37c4 try to fix simple route 2016-08-15 12:51:28 +02:00
Jan Christoph Uhde 61e384e8f2 Merge remote-tracking branch 'origin/engine-vs-velocystream' into merge_jans 
* origin/engine-vs-velocystream: (54 commits)
  Fix testing
  Proper roles of servers
  Streamline agency testing
  Fix if
  Fix testing
  Improve clusterawareness in foxx and foxx queues
  Add test because of keysorting bugfix
  Couldn't query two different keys beginning with the same string in one level
  Add download and slack buttons to documentation header
  gv
  Adjustment for Repository Version
  Adjustment for Repository Version
  Adjustment for Repository Version
  Update build-repository.h.in
  improved gv
  Create build-repository.h.in
  queryView bugfix
  grunt build
  improved gv, added limit
  improved gv
  ...
 2016-08-15 08:51:38 +02:00
Jan Christoph Uhde e62b4f69d6 add better logging and clean up code 2016-08-12 15:05:03 +02:00
Jan Christoph Uhde 3d4e1f6922 clean up code 2016-08-11 16:44:12 +02:00
Jan Christoph Uhde a1d6909f88 make use of generateBody in payload and fix some bugs in VppCommTask 2016-08-11 13:20:58 +02:00
Michael Hackstein 7b328d39e9 Merge branch 'devel' of github.com:arangodb/arangodb into engine-vs-velocystream 2016-08-11 12:41:08 +02:00
Jan Christoph Uhde b3fab8c618 fix header 2016-08-11 09:03:34 +02:00
Jan Christoph Uhde da0c40cff7 server should now reply 2016-08-10 11:11:26 +02:00
Jan Christoph Uhde 8f6ff64d00 fix errors in vpp protocol 2016-08-09 19:09:24 +02:00
servusoft 7315777bc2 Adjustment for Repository Version 2016-08-09 14:05:34 +02:00
servusoft 1a13206b65 Adjustment for Repository Version 2016-08-09 14:00:03 +02:00
Jan Christoph Uhde 0e5b455159 setPayload of response now takes contType instead of request 2016-08-08 14:48:56 +02:00
Jan Christoph Uhde 655e45a19a rename functions to be compliant with coding conventions 2016-08-05 18:20:10 +02:00
Jan Christoph Uhde ed0fc2e83d do not overwrite CUSTOM ContentType 2016-08-05 12:32:45 +02:00
Jan Christoph Uhde 65e5d4e6ac fix handling of content type 2016-08-05 12:25:29 +02:00
Jan Christoph Uhde 50fe64d6ca convert contentTypes 2016-08-04 16:42:30 +02:00
Jan Christoph Uhde 3c4db6783c update test 2016-08-04 15:02:04 +02:00
Jan Christoph Uhde 01c1c09d5a add first vpack test -- content type has to be fixed first 2016-08-04 13:32:25 +02:00
Jan Christoph Uhde 54eda61754 connect response to CommTask WriteBuffers 2016-08-03 16:08:04 +02:00
Jan Christoph Uhde cb275e239f add: clean buffer for VppCommTask 2016-08-03 09:20:22 +02:00
Jan Christoph Uhde 05b8995bbf update VppRequest 2016-08-02 13:45:49 +02:00
Jan Christoph Uhde 25226b1459 add: header() / headers() implemented for VppRequest 2016-08-02 11:36:06 +02:00
jsteemann 3c8f644c2d fix cluster communication 2016-08-01 17:13:00 +02:00
Jan Christoph Uhde c59a553723 fix some errors -- http tests failing in cluster 2016-08-01 15:19:11 +02:00
Jan Christoph Uhde 29a87ef109 fix move 2016-08-01 12:37:01 +02:00
Jan Christoph Uhde ef12d8dc2c struggle with ctor 2016-08-01 11:48:30 +02:00
Jan Christoph Uhde 732c182388 fix building 2016-07-27 12:08:07 +02:00
Jan Christoph Uhde 59ec4bf83b enable VPACK 2016-07-27 09:12:28 +02:00
Jan Christoph Uhde 4c37db381a get rid fo cookies in non-http requests 2016-07-26 10:38:34 +02:00
Jan Christoph Uhde da81c32539 remove body() method from GeneralRequest 2016-07-25 16:46:53 +02:00
Jan Christoph Uhde ef6643e8b4 add: VppResponse 2016-07-25 16:06:33 +02:00
Jan Christoph Uhde 0e25dca075 add: VppRequest 2016-07-25 14:22:25 +02:00
Jan Christoph Uhde 5edaf0043a preparations for velocystream completed 2016-07-21 09:32:00 +02:00
Max Neunhoeffer 6f4b48cfcf Try to fix performance issue with single documents in cluster. 
This creates a fast path in performRequests for the case that only
one request is given. We use syncRequest instead of asyncRequest
to save a network roundtrip. Furthermore, all queues and locks
in ClusterComm are circumvented.
 2016-07-20 15:15:41 -07:00
Jan Christoph Uhde 6f39b389c3 fix: initialize variables in Base class 2016-07-20 09:10:16 +00:00
Jan Christoph Uhde 06bd01695a removed: body() from GeneralRequest 2016-07-19 09:16:07 +02:00
Jan Christoph Uhde 002a1e55cb add: payload/addPayload methods 2016-07-18 13:16:08 +02:00
Jan Christoph Uhde beae8a8f74 first changes for set/get payload methods -> 
toVelocyPack now returns slices
 2016-07-15 16:38:13 +02:00
Jan Christoph Uhde 682cf7a2f1 virtualize functions of request/response 2016-07-14 08:40:05 +02:00
Frank Celler a8e29450f4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:13:38 +02:00
Frank Celler 38a55ed13c Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:09:40 +02:00
jsteemann 9593ac122d dont include unused StringBuffer 2016-07-04 15:00:08 +02:00
jsteemann ee492c67e8 add info about assertions 2016-06-15 22:36:05 +02:00
Frank Celler 8dd9ce47a0 fixed // and /./ handling 2016-06-12 23:36:13 +02:00
Frank Celler f65393394a fixed double // 2016-06-10 16:36:09 +02:00
Frank Celler 927c697b8b fixed auth (again) 2016-06-10 16:21:48 +02:00
jsteemann 325aa13795 merge with velocypack 2016-06-06 16:59:36 +02:00
Frank Celler 1e25e5d262 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 
Conflicts:
	arangod/Cluster/HeartbeatThread.cpp
	arangod/RestServer/RestServerFeature.cpp
 2016-06-01 16:25:13 +02:00
Frank Celler 963449d5f7 WIP 2016-06-01 13:37:13 +02:00
Jan Steemann 66c0385fe0 added RocksDB version information, fixed comparator 2016-05-27 12:58:26 +02:00
Frank Celler c441700c20 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-05-22 21:45:40 +02:00
Frank Celler af0b0900af WIP 2016-05-22 21:08:37 +02:00
Frank Celler 806fce1dec WIP 2016-05-21 21:58:42 +02:00
Max Neunhoeffer e0d596e6dc Fix a crash in RestShardHandler. 2016-05-19 16:47:53 +02:00
Frank Celler 9dbba248de added fillBody 2016-05-13 15:14:44 +02:00
jsteemann 07aa8b4dac more version info 2016-05-12 11:11:31 +02:00
jsteemann 130493d481 micro optimizations 2016-05-11 21:02:20 +02:00
Frank Celler bf16086623 moved SSL files into separate directory 2016-05-11 16:34:03 +02:00
jsteemann 3f1516eca7 bugfixes 2016-05-11 15:01:06 +02:00
jsteemann 98f0ad81a6 micro optimizations 2016-05-11 14:06:47 +02:00
jsteemann bfd5596359 optimizations 2016-05-11 11:50:07 +02:00
jsteemann 0ce8599598 fixes for MSVC 2016-05-10 19:01:21 +02:00
jsteemann 61be9321a7 removed unused code 2016-05-10 16:04:10 +02:00