1
0
Fork 0
Commit Graph

28553 Commits

Author SHA1 Message Date
Max Neunhoeffer fc64732d7f Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-15 15:20:40 +02:00
Max Neunhoeffer a4a8888e54 Sort out cluster test shutdown. 2016-04-15 15:20:28 +02:00
Michael Hackstein 20733a81ae Improved baby errors in cluster 2016-04-15 14:48:44 +02:00
Kaveh Vahedipour 7e039ef1a2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-15 14:10:43 +02:00
Kaveh Vahedipour a6193a58eb unguarded access to _time_table in Store 2016-04-15 14:10:21 +02:00
hkernbach a2f57b2ca8 grunt 2016-04-15 13:49:44 +02:00
hkernbach 58f2dd6287 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-15 13:49:35 +02:00
Max Neunhoeffer 58b08993ac Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-15 13:49:08 +02:00
Max Neunhoeffer 8490606317 Add a warning about shared folders. 2016-04-15 13:48:51 +02:00
hkernbach d6d741a27a images, html 2016-04-15 13:48:16 +02:00
Jan Steemann 4fe311ba92 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-15 12:40:26 +02:00
Jan Steemann 65e6aed49f jslint 2016-04-15 12:40:14 +02:00
Max Neunhoeffer 860c5f77ed Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-15 12:35:56 +02:00
Max Neunhoeffer 0918516e34 Minor changes. 2016-04-15 12:27:35 +02:00
Jan Steemann a071a2ffe2 fixed startup race 2016-04-15 12:01:14 +02:00
Michael Hackstein 0e2d31f633 Moved GET _api/document?collection=xxx to PUT _api/simple/all-keys {collection: xxx}. Adapted all tests. Also removed Transaction::allKeys which got obsolete by this commit. 2016-04-15 11:23:25 +02:00
Jan Steemann 0073a86228 fix potential agency initialization race 2016-04-15 10:45:50 +02:00
Michael Hackstein 4dc69a0162 Fixed a bug in Shard distribution for Cluster Coordinator. 2016-04-15 10:32:07 +02:00
Michael Hackstein 59f7d1ec70 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-15 08:25:05 +02:00
Max Neunhoeffer e68a60f81f Remove a test that is no longer needed. 2016-04-15 00:39:55 +02:00
Max Neunhoeffer ce150a6539 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-15 00:14:12 +02:00
Max Neunhoeffer cac003a0f4 Take out trace log in testing.js 2016-04-15 00:13:48 +02:00
Max Neunhoeffer 429e59108b Improve situation with tests. 2016-04-15 00:13:37 +02:00
hkernbach cbe91c6df9 scss 2016-04-14 23:49:25 +02:00
hkernbach 0f3997d162 grunt build 2016-04-14 23:44:46 +02:00
hkernbach 8b4f0ed6e8 responsive scss changes 2016-04-14 23:41:24 +02:00
hkernbach c6f82ef3ae new edge api adjustments 2016-04-14 23:41:08 +02:00
hkernbach 06a54b5841 frontend router 2016-04-14 23:14:00 +02:00
hkernbach ff264ea01c scss 2016-04-14 23:13:51 +02:00
hkernbach e27c6d1554 grunt 2016-04-14 22:53:46 +02:00
hkernbach 5b03dfef1e new collection view + subviews 2016-04-14 22:49:39 +02:00
jsteemann 87c79ca41c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-14 22:03:32 +02:00
jsteemann ad062b0566 turn off trace-level logging 2016-04-14 22:03:21 +02:00
hkernbach bcaadd878f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 21:56:52 +02:00
hkernbach 5c153730d2 view, subviews, scss 2016-04-14 21:56:43 +02:00
Jan Steemann bccbfc8042 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-14 20:57:31 +02:00
Jan Steemann 46e5150272 micro optimizations 2016-04-14 20:57:24 +02:00
Michael Hackstein eee02b40cb Use proper URL encoding in Cluster Documents API (single case) 2016-04-14 20:26:11 +02:00
Max Neunhoeffer dab12cbeed Take out a debugging message. 2016-04-14 20:20:56 +02:00
Michael Hackstein 2f5910f828 Removed debug output and deactivated TRACE log level during tests 2016-04-14 20:15:26 +02:00
Michael Hackstein 8989c9e31c Fixed condition checking in SingleDocument Read Cluster case 2016-04-14 20:13:59 +02:00
Michael Hackstein 8c7023850e Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 19:37:28 +02:00
Andreas Streichardt 49d0407859 Trace vs info again 2016-04-14 18:23:08 +02:00
Andreas Streichardt 23af9480f6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 18:18:16 +02:00
Andreas Streichardt 612c387c56 Optimize version increase stuff 2016-04-14 18:17:25 +02:00
Wilfried Goesgens 177d159282 get some inspiration from https://github.com/sleepycat/arangodb-git_arch/blob/master/arangodb.service 2016-04-14 18:11:14 +02:00
Michael Hackstein 483ca0d5b3 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 17:42:41 +02:00
Michael Hackstein 4411bb390b REmoved dead code 2016-04-14 17:41:25 +02:00
Michael Hackstein 3434be7b7a Implemented documents baby variant for cluster and also improved the baby tests. ALl errors will now have exactly one representation for each baby document even if they could be identified earlier. 2016-04-14 17:40:28 +02:00
Kaveh Vahedipour 333d53e733 store's operator handling on non-keyword 'op' and consistent handling of keys as paths 2016-04-14 17:29:46 +02:00