1
0
Fork 0
Commit Graph

26364 Commits

Author SHA1 Message Date
Jan Steemann 37a98be599 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-19 12:52:38 +01:00
Jan Steemann e4fb8b184b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-19 12:51:52 +01:00
Michael Hackstein ed72993cd6 Rest Import Handler now uses new transaction API for truncate as well 2016-02-19 12:51:06 +01:00
Michael Hackstein 64c66a53e5 V8-Trancuate now uses new transaction API 2016-02-19 12:50:40 +01:00
Michael Hackstein 09c6c4bd0d HTTP DELETE now uses new transaction API 2016-02-19 12:50:20 +01:00
hkernbach 53f1ee2c2d grunt build 2016-02-19 12:43:23 +01:00
hkernbach 45ae730404 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-19 12:43:07 +01:00
hkernbach 60299e0b54 progress view 2016-02-19 12:42:56 +01:00
Wilfried Goesgens 22a361f484 better host os detection with the possibility to force 64 bits. 2016-02-19 12:42:27 +01:00
Wilfried Goesgens b440ed74f1 Force V8 solaris builds to 64 bits 2016-02-19 12:38:48 +01:00
Frank Celler baa0999ee6 fixed path for libev 2016-02-19 12:35:19 +01:00
Frank Celler 417db335ab removed old files 2016-02-19 12:26:26 +01:00
Jan Steemann 18b6f3bbd9 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-19 12:23:55 +01:00
Max Neunhoeffer 0c97d9652a Fix SingleCollectionTransaction in cluster case.
Collection ID lookup was not cluster ready.
2016-02-19 12:19:35 +01:00
hkernbach 59130ab175 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-19 12:13:16 +01:00
hkernbach 9fe0f9bea3 collection view web ui 2016-02-19 12:13:04 +01:00
Jan Steemann d97cfc84e4 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-19 12:06:18 +01:00
Max Neunhoeffer bca482661a Factor out buildDocumentIdentity. 2016-02-19 11:56:44 +01:00
Jan Steemann 8b8101fc59 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-19 11:44:06 +01:00
Jan Steemann 4a550838f4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-19 11:43:01 +01:00
Jan Steemann adde757e46 move v8 try-catch into handle scopes 2016-02-19 11:42:44 +01:00
hkernbach 4a903a9e6b grunt 2016-02-19 11:31:33 +01:00
hkernbach e8f544c2f0 collections view web ui 2016-02-19 11:31:18 +01:00
Frank Celler c5be313670 -stdlib=libc++ is also required in CXXFLAGS 2016-02-19 11:15:54 +01:00
Max Neunhoeffer ac7a3e6d6a Switch off assembler CRC32 on Windows by default. 2016-02-19 10:59:13 +01:00
Frank Celler 4dbf7be8dc check for location of etc 2016-02-19 10:44:06 +01:00
Max Neunhoeffer f95860c143 Sort out _ chaos in assembler source. 2016-02-19 10:32:59 +01:00
jsteemann 62130d3239 locking-related bugfixes 2016-02-19 00:31:28 +01:00
Frank Celler 972acd6ae8 trying to fix Darwin 2016-02-19 00:01:05 +01:00
Kaveh Vahedipour 303bc50fd9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-18 23:27:03 +01:00
Kaveh Vahedipour db9d23b7ef Adapting to intel compiler 15.0 2016-02-18 23:26:45 +01:00
Kaveh Vahedipour 2dcb98b5e9 Adapting to intel compiler 15.0 2016-02-18 23:26:30 +01:00
Frank Celler 68c911fc03 cleanup of flags 2016-02-18 23:13:56 +01:00
Max Neunhoeffer a62a23d167 Fix compilation. 2016-02-18 23:09:07 +01:00
Max Neunhoeffer 5fccaecc67 Add API for Transaction::indexScan. 2016-02-18 22:34:53 +01:00
Frank Celler ec8049fa29 moved CC in front of configure 2016-02-18 22:00:18 +01:00
Frank Celler 8ec4656b92 trying to fix compiler options 2016-02-18 21:45:18 +01:00
Max Neunhoeffer 092d96db08 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-02-18 21:26:29 +01:00
hkernbach baaefd153d removed unnecessary reload trigger 2016-02-18 20:54:37 +01:00
hkernbach 826d26b4ed grunt build 2016-02-18 20:46:49 +01:00
hkernbach 2cdce150e1 fixed #1743, fixed a bug in query management 2016-02-18 20:45:37 +01:00
Frank Celler 53f89809c6 use LIBS instead of LDFLAGS 2016-02-18 18:45:16 +01:00
Jan Steemann 7ddf129cb4 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-18 18:20:51 +01:00
Frank Celler 9cde1c20da locate arangosh 2016-02-18 18:12:53 +01:00
Frank Celler b712fb7542 use BIN_DIR to locate executables 2016-02-18 18:06:06 +01:00
Jan Steemann 22fa100657 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-18 17:54:51 +01:00
Jan Steemann b349e80bbd Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-18 17:54:40 +01:00
Jan Steemann 367c234d96 implemented count() 2016-02-18 17:54:28 +01:00
Frank Celler b537a05aac change compatibility 2016-02-18 17:50:20 +01:00
Kaveh Vahedipour 541aefdd2e Reestablished love 2016-02-18 17:32:35 +01:00