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

25227 Commits

Author SHA1 Message Date
Jan Steemann 7a55ae26d5 Merge branch 'vpack' of https://github.com/arangodb/arangodb into vpack 2015-12-17 15:02:31 +01:00
Michael Hackstein 342277b2be Merge branch 'vpack' of github.com:arangodb/arangodb into vpack 2015-12-17 14:41:29 +01:00
Jan Steemann 1faaaa0632 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-17 14:41:24 +01:00
Jan Steemann 093a3a4fb8 Merge branch 'vpack' of https://github.com/arangodb/arangodb into vpack 2015-12-17 14:41:19 +01:00
Michael Hackstein c49876bf23 Fixed uninitialized access in VocbaseCollectionInfo constructor 2015-12-17 14:41:13 +01:00
Jan Steemann 7fa0fc7d33 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-12-17 14:39:57 +01:00
Jan Steemann 1ce6f6f8c0 updated vpack library 2015-12-17 14:39:39 +01:00
Michael Hackstein 119a7fdee3 Fixed uninitialized access in VocbaseCollectionInfo constructor 2015-12-17 14:36:44 +01:00
Wilfried Goesgens 52e79fbe53 Fix lint 2015-12-17 14:16:46 +01:00
Jan Steemann 16c0158483 Merge branch 'vpack' of https://github.com/arangodb/arangodb into vpack 2015-12-17 14:10:57 +01:00
Michael Hackstein cd93e959bd Fixed compiler warnings 2015-12-17 14:07:55 +01:00
Michael Hackstein c7b327e7de Fixed access to uninitialized variables 2015-12-17 14:03:43 +01:00
Wilfried Goesgens 58dbb81eba Cleanup; test de/serlialization. 2015-12-17 13:49:43 +01:00
Wilfried Goesgens d28f87b574 - Test de/serialization of filter arguments 
- test multiple edge collection with in and outbound edges
 2015-12-17 13:47:54 +01:00
Wilfried Goesgens e908be8cd4 fix style 2015-12-17 13:39:05 +01:00
Michael Hackstein c99582bf95 Merge branch 'vpack' of github.com:arangodb/arangodb into vpack 2015-12-17 13:24:52 +01:00
Michael Hackstein 46b9ac5c53 Fixed collection constructor from name 2015-12-17 13:24:45 +01:00
Jan Steemann 39fccee992 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-17 13:23:24 +01:00
Jan Steemann 0085202b56 fixed import tests 2015-12-17 13:21:27 +01:00
Jan Steemann 677bec7fc3 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-17 13:15:29 +01:00
Jan Steemann 928837e1ff \0 fix 2015-12-17 13:07:05 +01:00
Alan Plum dd51a91d59 Always org/arangodb -> @arangodb 2015-12-17 13:02:39 +01:00
Max Neunhoeffer 27a41229bc Merge branch 'devel' into vpack 2015-12-17 12:54:11 +01:00
Michael Hackstein c6ae901487 Merge branch 'vpack' of github.com:arangodb/arangodb into vpack 2015-12-17 12:41:53 +01:00
Michael Hackstein b992423d1e Changed default type value for collections if not given in the JSON object on disc 2015-12-17 12:41:40 +01:00
Max Neunhoeffer 942b3656e3 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-12-17 12:34:08 +01:00
Max Neunhoeffer f3a5aea8cf Fix arangodump in cluster. 2015-12-17 12:33:10 +01:00
Jan Steemann ad45a4b254 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-17 12:31:14 +01:00
Jan Steemann b76c61adb1 \0 fix 2015-12-17 12:28:16 +01:00
Max Neunhoeffer ec7f6be918 Merge branch 'vpack' of ssh://github.com/ArangoDB/ArangoDB into vpack 2015-12-17 12:14:25 +01:00
Max Neunhoeffer 812994d459 Fix arangodump in vpack branch. 2015-12-17 12:12:59 +01:00
Michael Hackstein 002c876858 Fixed nullptr exception for keyOptions. 2015-12-17 11:35:08 +01:00
Michael Hackstein f708becba1 Fixed VPack parser error during startup 2015-12-17 11:31:20 +01:00
Jan Steemann 2b3f3f997b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-17 10:59:30 +01:00
jsteemann ead2ee47e7 issue #1409: fix NUL-byte handling 2015-12-17 10:54:24 +01:00
Jan c4f5f69b01 Merge pull request #1616 from kibarda/devel 
documentation: point out the User Function is defined on the selected database
 2015-12-16 22:39:30 +01:00
jmvan 6735bac8e3 point out the user function is defined on the selected database 2015-12-16 21:29:12 +01:00
jsteemann c786d9ff5f re-activated tests. jstlint complained about that 2015-12-16 20:13:33 +01:00
jsteemann 11355b6e6f jslint 2015-12-16 20:09:22 +01:00
Jan Steemann 164741f144 improved diagnostic message 2015-12-16 19:52:31 +01:00
Jan Steemann 6ee9a6f90e replication fixes 2015-12-16 19:52:01 +01:00
jsteemann d0d8ec208d added derived file 2015-12-16 19:51:31 +01:00
jsteemann deb6c14bf4 cppcheck 2015-12-16 19:51:23 +01:00
Michael Hackstein 82eea28fea Merge branch 'vpack' of github.com:arangodb/arangodb into vpack 2015-12-16 19:03:15 +01:00
Michael Hackstein 73f3ddc753 Finished with first move to VocbaseCollectionInfo class. This commit compiles but it is untested. 2015-12-16 19:03:07 +01:00
Michael Hackstein e40679e4b5 Integrated the new VocbaseCollectionInfo in Document-collection 2015-12-16 18:59:03 +01:00
Michael Hackstein d506300568 Integrated the new VocbaseCollectionInfo in VocShaper 2015-12-16 18:58:49 +01:00
Michael Hackstein cad674549e Integrated the new VocbaseCollectionInfo in Vocbase main 2015-12-16 18:58:34 +01:00
Michael Hackstein c2eb6553ae The web of TRI_col_info_t is increasing... 2015-12-16 18:56:54 +01:00
Michael Hackstein a1c66851da Further adoptions to the VocbaseCollectionInfo class in V8Server 2015-12-16 18:53:47 +01:00