1
0
Fork 0
Commit Graph

8079 Commits

Author SHA1 Message Date
Andreas Streichardt 91df9e36b2 Merge branch 'agency' into devel 2016-04-04 15:50:25 +02:00
Kaveh Vahedipour 005e8dfd00 type fixed 2016-04-04 15:48:11 +02:00
Andreas Streichardt a2b8bb92f2 Oops...still conflicted 2016-04-04 15:45:30 +02:00
Andreas Streichardt 675ccf06f9 Merge branch 'agency' of github.com:arangodb/arangodb into agency 2016-04-04 15:22:42 +02:00
Kaveh Vahedipour 3d3f11ef54 comments 2016-04-04 12:55:18 +00:00
Kaveh Vahedipour 5caf02768c code beautification 2016-04-04 14:42:49 +02:00
Kaveh Vahedipour 062a759bca Merge branch 'agency' of https://github.com/arangodb/arangodb into devel 2016-04-04 12:13:48 +00:00
Kaveh Vahedipour 723eb01cee merging back from agency 2016-04-04 12:13:43 +00:00
Andreas Streichardt e5850658fb Merge branch 'devel' of github.com:arangodb/arangodb into agency 2016-04-04 13:36:22 +02:00
Kaveh Vahedipour 1293c9301a agency's own endpoint is now derived from server.endpoint 2016-04-04 11:23:46 +00:00
Kaveh Vahedipour c61f73314c endpoints are now coming from applicationendpointserver 2016-04-04 12:49:35 +02:00
Kaveh Vahedipour b26ea07eaf endpoints are now coming from applicationendpointserver 2016-04-04 11:50:24 +02:00
Kaveh Vahedipour 67e6e403e3 agency's own endpoint is now derived from server.endpoint 2016-04-04 11:28:48 +02:00
Jan Steemann d8b993f0fb fixed some issues with tests 2016-04-04 10:47:04 +02:00
Kaveh Vahedipour bcc180bf2b Clearing time table effectlively done the same way as for external calls 2016-04-04 08:41:59 +02:00
Andreas Streichardt 983c6f1b7e Merge branch 'agency' of github.com:arangodb/arangodb into agency 2016-04-01 17:21:42 +02:00
Andreas Streichardt 70d6f1259a Finally cluster is working with the new agency 2016-04-01 17:07:28 +02:00
Kaveh Vahedipour 3e2f7b4043 replaced put_time 2016-04-01 15:34:13 +02:00
Kaveh Vahedipour a3d8ce9cab gcc 4.8 does not entail std::put_time 2016-04-01 15:22:08 +02:00
Kaveh Vahedipour 1dba990295 ttl overwrite 2016-04-01 15:10:20 +02:00
Kaveh Vahedipour f013604f47 ttl overwright 2016-04-01 15:01:53 +02:00
Kaveh Vahedipour 0849737d78 Overwriting ttls 2016-04-01 14:28:25 +02:00
Kaveh Vahedipour 8ace3c10a3 Overwriting ttls 2016-04-01 14:24:30 +02:00
Kaveh Vahedipour 65623fc4e7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-01 10:42:07 +02:00
Frank Celler 8e39a3c889 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-01 10:39:50 +02:00
Frank Celler 068f9defd7 splitted HttpResponse.h 2016-04-01 10:39:38 +02:00
Kaveh Vahedipour 0b552be0f1 Merge branch 'agency' of https://github.com/arangodb/arangodb into devel 2016-04-01 10:38:32 +02:00
Kaveh Vahedipour e0990c947e fixed broken agency test 2016-04-01 10:38:10 +02:00
Kaveh Vahedipour 5363703846 Log.h not needed anymore 2016-04-01 09:10:55 +02:00
Kaveh Vahedipour a62be6a6ea remerged devel 2016-03-31 23:34:39 +02:00
Kaveh Vahedipour 768e376c35 ttls revisited for proper logging 2016-03-31 22:35:50 +02:00
Frank Celler a11a7c134c maintainer mode fixes 2016-03-31 17:39:52 +02:00
Frank Celler ae45b7cd67 MSVC fixes 2016-03-31 17:16:37 +02:00
Kaveh Vahedipour 18d0528c1c Merge back from agency 2016-03-31 17:12:57 +02:00
Kaveh Vahedipour 650f1bb06a Correction to adapt to HTTP_REQUEST 2016-03-31 17:10:25 +02:00
Kaveh Vahedipour 394dcdb46b added more precondition and ttl tests 2016-03-31 16:50:00 +02:00
Kaveh Vahedipour 8ac7491e53 cleaning up log messages. corrected agency test for failed precondition. 2016-03-31 16:10:25 +02:00
Andreas Streichardt b2fc192dd2 implement new agency 2016-03-31 14:03:01 +02:00
Frank Celler 1c0492ff8a MSVC fixes 2016-03-31 14:02:02 +02:00
Frank Celler 295c8a3809 MSVC fixes 2016-03-31 14:01:23 +02:00
Kaveh Vahedipour cec6c4bc13 merge back from agency 2016-03-31 11:52:18 +00:00
Kaveh Vahedipour 66d668ba13 merge back from agency 2016-03-31 11:50:05 +00:00
Kaveh Vahedipour a0edfe2b8d ids need to be sorted in the proper order. zero filling from left 2016-03-31 12:23:07 +02:00
Kaveh Vahedipour cdd76c1b89 still ttl in long 2016-03-31 11:53:08 +02:00
Andreas Streichardt 3203dbda01 Merge branch 'agency' of github.com:arangodb/arangodb into agency 2016-03-31 11:52:18 +02:00
Kaveh Vahedipour f4ee0729eb still ttl in long 2016-03-31 11:52:17 +02:00
Frank Celler 494bdca847 splitted HttpRequest into GeneralRequest/HttpRequest 2016-03-31 11:45:21 +02:00
Andreas Streichardt 4446345dba Merge branch 'agency' of github.com:arangodb/arangodb into agency 2016-03-31 11:44:36 +02:00
Kaveh Vahedipour 2ddc1cd8ec i am a teapot if value not found and only a single search string is requested 2016-03-31 11:44:02 +02:00
Andreas Streichardt 9fd044b2e9 Merge branch 'agency' of github.com:arangodb/arangodb into agency 2016-03-31 11:19:37 +02:00