1
0
Fork 0
Commit Graph

10286 Commits

Author SHA1 Message Date
Andreas Streichardt 91df9e36b2 Merge branch 'agency' into devel 2016-04-04 15:50:25 +02:00
Andreas Streichardt 675ccf06f9 Merge branch 'agency' of github.com:arangodb/arangodb into agency 2016-04-04 15:22:42 +02:00
Andreas Streichardt 1150d2b06a Talk to coordinator 2016-04-04 15:11:10 +02:00
Kaveh Vahedipour 9bfa55120a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-04 14:58:34 +02:00
Kaveh Vahedipour 47bac5b4d9 temporary fix of jslint errors 2016-04-04 14:58:25 +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
Andreas Streichardt 3b81a1cd3d Merge branch 'agency' of github.com:arangodb/arangodb into agency 2016-04-04 13:35:59 +02:00
Andreas Streichardt d56500b4c0 Implement cluster tests 2016-04-04 13:35:30 +02:00
Kaveh Vahedipour 1293c9301a agency's own endpoint is now derived from server.endpoint 2016-04-04 11:23:46 +00:00
hkernbach f0bb30c3f7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-01 15:41:28 +02:00
hkernbach d464d69406 query view now reacts to a killed query 2016-04-01 15:41:20 +02:00
Kaveh Vahedipour 3127b4227b ttl overwright 2016-04-01 14:45:42 +02:00
Kaveh Vahedipour cfcffb7a41 jslint error in agency test correctedush 2016-03-31 21:32:12 +00:00
Kaveh Vahedipour 219df61370 jslint error in agency test corrected 2016-03-31 20:52:04 +00:00
Kaveh Vahedipour 1d536a2364 jslint error in agency test corrected 2016-03-31 20:24:56 +00:00
Kaveh Vahedipour 18d0528c1c Merge back from agency 2016-03-31 17:12:57 +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
Kaveh Vahedipour caeafa4113 fixed broken agency test 2016-03-31 16:02:44 +02:00
Alan Plum 77fc097601 Use _scanFoxx(replace:true) 2016-03-31 15:49:55 +02:00
Alan Plum 5a98ed9600 Always run _scanFoxx in a transaction 2016-03-31 15:00:37 +02:00
Kaveh Vahedipour 66d668ba13 merge back from agency 2016-03-31 11:50:05 +00: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
Alan Plum 7918975f77 Port fix for #1742 to 3.0 2016-03-30 16:14:18 +02:00
Alan Plum 963fa8f9ff Port #1742 test to 3.0 2016-03-30 16:14:17 +02:00
hkernbach 5612218835 spotlight view, query view, grunt build, scss 2016-03-29 17:28:08 +02:00
hkernbach dee5e6d118 query view support mac meta key 2016-03-29 15:53:22 +02:00
Kaveh Vahedipour cdc37d65fc Merge branch 'agency' of https://github.com/arangodb/arangodb into devel 2016-03-29 15:50:32 +02:00
Kaveh Vahedipour 1154a0db96 bug in increment and decrement in agency solved. 2016-03-29 15:49:33 +02:00
Kaveh Vahedipour a48b795b44 bug in increment and decrement in agency solved. 2016-03-29 15:48:49 +02:00
hkernbach d9347f576b query view copy to editor bugfix 2016-03-29 15:23:10 +02:00
hkernbach 2a571d1f6b query view bugfix 2016-03-29 15:18:36 +02:00
hkernbach 5ae925f6e0 query view 2016-03-29 14:19:16 +02:00
Kaveh Vahedipour 0257162f82 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-29 14:13:12 +02:00
hkernbach dadcee6eaa removed console logs 2016-03-29 13:46:30 +02:00
hkernbach 51678757cb frontend bugfix wrong collection type 2016-03-29 13:37:31 +02:00
Kaveh Vahedipour 7959f01d4a Merge branch 'agency' of https://github.com/arangodb/arangodb into agency 2016-03-29 11:10:24 +00:00
hkernbach 06e40476f7 frontend memory issue #1717 2016-03-29 11:01:32 +02:00
Jan Steemann ecf2deadb8 jslint 2016-03-24 19:35:37 +01:00
Kaveh Vahedipour 1f9e40fbf6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-24 17:54:13 +01:00
Kaveh Vahedipour afad06d1d0 updating tests 2016-03-24 17:54:02 +01:00
Andreas Streichardt 9ba72b4412 Properly update current collection 2016-03-24 16:55:15 +01:00
Andreas Streichardt 3f9f03bb38 Remove debug 2016-03-24 14:26:12 +01:00
Kaveh Vahedipour 8bc6d193c4 Remerge from devel into agency for integration into cluster 2016-03-24 11:17:59 +01:00
Andreas Streichardt 8cdf8eebad More python fixes 2016-03-23 18:36:22 +01:00
Kaveh Vahedipour 7254ad4c9e Fixing issues 2016-03-23 15:16:47 +01:00