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

28771 Commits

Author SHA1 Message Date
Jan Steemann 2533affb02 fixed crash 2016-04-19 15:38:30 +02:00
Kaveh Vahedipour 0ed4c912b4 some wrong header declarations 2016-04-19 13:11:42 +00:00
Alan Plum 7ff989687c
Rebuild aardvark 2016-04-19 15:06:56 +02:00
Alan Plum 4c3319de25
Extract session storage.save 
Also fix transports
 2016-04-19 15:06:55 +02:00
Max Neunhoeffer f3e47db5d8 Add a dumpAgency script. 2016-04-19 14:51:17 +02:00
Max Neunhoeffer 5c232edee2 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-19 14:44:35 +02:00
Max Neunhoeffer 0d1a7239c1 Bugfixes for synchronous replication. 2016-04-19 14:44:23 +02:00
Max Neunhoeffer 65e66b92a7 Add startAgency script. 2016-04-19 14:43:53 +02:00
Max Neunhoeffer 4beb3deac8 New agency test. 2016-04-19 14:43:35 +02:00
Michael Hackstein 7e6fd1561e Reverted usage of externals in Graph Functions. Commit was to early. Still warting for transparent handling of externals in VelocyPack 2016-04-19 14:42:17 +02:00
Michael Hackstein 8447842227 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 14:32:32 +02:00
Michael Hackstein be118b1b80 Former JsonCursor now uses QueryResult and contains the TRX context for continuuos reads 2016-04-19 14:32:23 +02:00
Kaveh Vahedipour 5eed7c8b44 some wrong header declarations 2016-04-19 12:15:20 +00:00
Alan Plum d0ce74803c
Make sure session exists before checking it in aardvark 2016-04-19 13:58:50 +02:00
Jan Steemann 386fee8099 updated vpack library 2016-04-19 13:44:53 +02:00
Max Neunhoeffer 9e43206513 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-19 13:25:31 +02:00
Jan Steemann 32082e30f0 use move 2016-04-19 13:20:13 +02:00
hkernbach 2bd9dfea61 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 13:16:44 +02:00
hkernbach 179e5ee7a5 scss, views 2016-04-19 13:15:16 +02:00
Michael Hackstein 36e608a5fd Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 12:32:54 +02:00
Michael Hackstein cf737639ba V8Traverser now uses externals in Slices instead of direct documents 2016-04-19 12:30:50 +02:00
Kaveh Vahedipour 87bc35068b FHM merge from devel 2016-04-19 09:59:33 +00:00
Kaveh Vahedipour 2435dcc71b Outsourced config_t 2016-04-19 08:29:07 +00:00
Kaveh Vahedipour 2c1f9efc3b Outsourced config_t 2016-04-19 08:21:40 +00:00
Kaveh Vahedipour d3dfaab906 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 08:00:00 +00:00
Kaveh Vahedipour d97d23b8df naming and FMH merge perp 2016-04-19 07:59:51 +00:00
Alan Plum ffcbd0a69e
Fix require tests 2016-04-19 09:29:24 +02:00
Max Neunhoeffer 168f3e0e7a Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-19 08:55:11 +02:00
Kaveh Vahedipour 96ee5b6b60 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 08:41:08 +02:00
Kaveh Vahedipour 934b7ca107 cppcheck warnings 2016-04-19 08:40:56 +02:00
Frank Celler f6fdcece0b fixed order fiasco 2016-04-19 08:05:23 +02:00
Frank Celler 75d3de2b31 fixed merge 2016-04-19 07:52:02 +02:00
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
 2016-04-19 07:44:00 +02:00
Frank Celler f85c700d20 silence some warnings 2016-04-19 07:35:03 +02:00
jsteemann 9eb3036c2e fixed typo 2016-04-18 22:40:15 +02:00
Max Neunhoeffer dc7f855cfc Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-18 19:59:22 +02:00
Simran Brucherseifer 097dcb0984 Minor corrections 2016-04-18 19:01:56 +02:00
Alan Plum 98423f451e
Don't generate mimetypes.js 2016-04-18 18:19:24 +02:00
Jan Steemann f686188d5b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-18 18:11:36 +02:00
Jan Steemann aaf6176347 remove useless checks 2016-04-18 18:11:28 +02:00
Jan Steemann 6df71935d8 fixed inclusion of removed file 2016-04-18 18:04:20 +02:00
Alan Plum 715abfe133 Merge pull request #1612 from arangodb/fotf 
Foxx Of The Future 🎉
 2016-04-18 18:02:06 +02:00
Alan Plum 051a153252
@arangodb/foxx -> @arangodb/foxx/legacy 2016-04-18 18:01:08 +02:00
Alan Plum c55eeac990
Fix FM nightly test 2016-04-18 18:01:07 +02:00
Alan Plum c39eca49e4
Add require.aliases 2016-04-18 18:01:06 +02:00
Alan Plum 9f25f44a87
Don't check the Foxx store unless you actually need it 2016-04-18 18:01:06 +02:00
Alan Plum 777848472d
standalone.html -> index.html 2016-04-18 18:01:05 +02:00
Alan Plum 02ee7c5489
Fix Foxx session transports error message 2016-04-18 18:01:04 +02:00
Alan Plum 4b509adf15
Nicer warnings/errors 2016-04-18 18:01:04 +02:00
Alan Plum c2b6f33407
Fix aardvark redirect 2016-04-18 18:01:03 +02:00