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

27117 Commits

Author SHA1 Message Date
Jan Steemann b209accf29 removed json 2016-03-02 11:34:31 +01:00
Max Neunhoeffer 9da16d66a0 Fix bugs in Transaction replace method for babies. 2016-03-02 11:32:49 +01:00
Wilfried Goesgens 5c152e9923 Merge branch 'devel' of github.com:arangodb/ArangoDB into solaris 2016-03-02 11:32:28 +01:00
Jan Steemann 0887c50c8f fixed logger initialization and shutdown 2016-03-02 11:31:41 +01:00
Jan Steemann 87a7b0ec36 fixed logger shutdown 2016-03-02 11:29:54 +01:00
Jan Steemann fe86b1c017 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 11:05:13 +01:00
Jan Steemann 92493f2807 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 11:04:58 +01:00
Jan Steemann 2a63d04289 fix assertions in non-maintainer mode 2016-03-02 11:04:29 +01:00
Max Neunhoeffer 738e595df3 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-02 10:59:39 +01:00
Jan Steemann 91ca37facb Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 10:54:29 +01:00
Jan Steemann 4271879c08 fix assertions in non-debug builds 2016-03-02 10:54:12 +01:00
Jan Steemann e6e864cd7a removed unused functions 2016-03-02 10:53:59 +01:00
Max Neunhoeffer 9a1acd1833 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-02 10:53:57 +01:00
Max Neunhoeffer 0f883dc0c8 Adjust replace to new TRI_V8ToVPack. 2016-03-02 10:53:06 +01:00
Wilfried Goesgens 78d3bd28b5 Merge branch 'devel' of github.com:arangodb/ArangoDB into solaris 2016-03-02 10:50:28 +01:00
Wilfried Goesgens ae428829fc Merge branch 'solaris' of github.com:arangodb/ArangoDB into solaris 2016-03-02 10:50:15 +01:00
Michael Hackstein 4e5f24a869 Removed unnacessary imports of shape 2016-03-02 10:45:00 +01:00
Max Neunhoeffer 0770a4b665 Fix TRI_V8ToVPack to always deliver if no error is returned. 2016-03-02 10:33:09 +01:00
Wilfried Goesgens 318cdb8365 Merge branch 'solaris' of github.com:arangodb/ArangoDB into devel 2016-03-02 10:31:03 +01:00
Wilfried Goesgens e39871ae10 We need to specify use_snapshot=true for gyp. 2016-03-02 09:59:23 +01:00
Frank Celler 8d7734b2bc removed no-old-style 2016-03-01 23:56:42 +01:00
hkernbach 22da5c3b13 grunt 2016-03-01 20:07:49 +01:00
hkernbach b048c7b6c8 catch return in bindvars input field 2016-03-01 20:04:13 +01:00
hkernbach c60cfb684d added missing cache call 2016-03-01 19:02:01 +01:00
hkernbach d14108e063 scss lint 2016-03-01 18:43:40 +01:00
hkernbach d26aab4290 grunt 2016-03-01 18:41:30 +01:00
hkernbach 5b601f108a Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-03-01 18:39:05 +01:00
hkernbach 6a8988d3f1 scss, added copy to editor function 2016-03-01 18:38:46 +01:00
Max Neunhoeffer a374cabfb9 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-01 18:16:42 +01:00
Max Neunhoeffer 848860de45 Fix some bugs in replace. 2016-03-01 18:16:26 +01:00
Jan Steemann 285de1998b velocypack 2016-03-01 17:54:57 +01:00
Frank Celler c8b5ea0129 added -Wno-unused-parameter 2016-03-01 17:50:40 +01:00
Max Neunhoeffer 1398eea35a Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-01 17:50:39 +01:00
Max Neunhoeffer 2cfa417858 First go at babies variant of replace. RestHandler case missing. 2016-03-01 17:50:13 +01:00
Frank Celler 261e98bc3a fixed test dir 2016-03-01 17:49:57 +01:00
Wilfried Goesgens ac16a39315 Shut up visual studio, we know this is UTF-8. 2016-03-01 17:43:29 +01:00
Frank Celler c88a68358d CMAKE changes for Windows and Solaris 2016-03-01 17:31:30 +01:00
Frank Celler 3dc30a3a99 added internal 2016-03-01 16:12:47 +00:00
Jan Steemann 747349db19 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-01 17:03:58 +01:00
Jan Steemann 026cb57138 collection export now using vpack 2016-03-01 17:03:44 +01:00
Frank Celler 20a9df096b missing dependency 2016-03-01 16:53:23 +01:00
Frank Celler a6acf900bf added v8_build 2016-03-01 16:45:38 +01:00
Frank Celler ba74fa6f7a Merge branch 'solaris' of github.com:arangodb/arangodb into solaris 2016-03-01 16:41:40 +01:00
Frank Celler e70068ee94 compile both targets 2016-03-01 16:41:29 +01:00
Frank Celler 72b0546c21 fixed flags 2016-03-01 16:40:41 +01:00
Michael Hackstein 65abe721f3 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-01 16:39:04 +01:00
Michael Hackstein 7e30dab62f CollectionScanner and EnumerateCollectionBlocks now use VPack instead of Shapes and mptrs. 2016-03-01 16:38:55 +01:00
Michael Hackstein 922a96fee0 Added a reset function to OperationCursor. ALso added a switch to getMore to define that all documents are referenced as Externals instead of inplace 2016-03-01 16:37:21 +01:00
Michael Hackstein 03dbc4a745 Added a dummy to insert External VPackSlice references in AqlItemBlock. 2016-03-01 16:36:02 +01:00
Frank Celler 5f4e3b8f6f Merge branch 'solaris' of github.com:arangodb/arangodb into solaris 2016-03-01 16:32:06 +01:00