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

39481 Commits

Author SHA1 Message Date
jsteemann 5046112d86 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 18:01:26 +02:00
Simon Grätzer 6fd666fc8d Added some documentation 2017-03-29 17:56:04 +02:00
Frank Celler 3f0915b436 do not require config for --version 2017-03-29 17:52:36 +02:00
jsteemann 3ff4f15a19 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 17:50:55 +02:00
jsteemann e73417aef1 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 17:50:49 +02:00
Simon Grätzer 6b889e0a27 Fixed addIndexValues 2017-03-29 17:40:20 +02:00
mpv1989 9cfa58d07c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-29 17:33:23 +02:00
mpv1989 e763233ca7 Foxx: Fix arangoUser not being set correctly 2017-03-29 17:33:16 +02:00
Simon Grätzer cd9e9a13cf Path based enumerator 2017-03-29 17:33:02 +02:00
hkernbach 905259a8a1 fixed bundle mac build 2017-03-29 16:55:35 +02:00
mpv1989 bbbf4ea0b9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-29 15:57:43 +02:00
mpv1989 8fba5f2050 Docs: improved CORS docs 2017-03-29 15:57:33 +02:00
baslr 352ad60589 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-29 15:56:56 +02:00
jsteemann 2a6eade215 added LDAP url parser 2017-03-29 15:34:49 +02:00
baslr 0713099acc Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-29 15:13:24 +02:00
jsteemann bd4a2eb6b6 make @dothebart happier 2017-03-29 15:04:54 +02:00
mpv1989 8809de608d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-29 13:43:35 +02:00
mpv1989 59e000b743 Foxx: Fix CORS blowing up when headers are not set 2017-03-29 13:43:06 +02:00
Simon Grätzer 89a869d684 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 13:19:01 +02:00
hkernbach 2c10fb1d8a fixed issue: #2397 2017-03-29 12:53:55 +02:00
jsteemann f04f6e7cd4 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 12:53:26 +02:00
jsteemann d75a72eff2 honor feature optionality 2017-03-29 12:53:05 +02:00
jsteemann dcfd60f98c disable skiplist index for now 2017-03-29 12:37:44 +02:00
Wilfried Goesgens 619713c596 fix lock file error handling, improve error messages 2017-03-29 12:22:08 +02:00
jsteemann 080bd49791 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 12:16:22 +02:00
jsteemann df19cf3413 added stub implementation for update 2017-03-29 12:08:20 +02:00
Andreas Streichardt 0bf00036c6 Streamline shutdown and start 2017-03-29 11:55:02 +02:00
Simon Grätzer d8d7b99a47 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 11:38:24 +02:00
Simon Grätzer a86abeae40 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-29 11:35:42 +02:00
Simon Grätzer 901abc6705 Fixing some windows conversion warnings 2017-03-29 11:35:37 +02:00
Jan Christoph Uhde 408d7cab12 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  fixed serialization bug
  warn before we run out of file descriptors
  updated CHANGELOG
  slightly simplify logging
 2017-03-29 11:22:18 +02:00
jsteemann 02aca574f4 turn off ranges test by default 2017-03-29 11:20:12 +02:00
jsteemann d99945e962 use ReadWriteLockCPP11 instead of ReadWriteLock 
ReadWriteLock is now a typedef for ReadWriteLockCPP11
one of the classes will finally be removed when it is known which locking concept is superior
 2017-03-29 11:13:50 +02:00
Jan Christoph Uhde 796c32a341 improve error handling in some places 2017-03-29 11:04:04 +02:00
jsteemann bf6e3bddbe fix MSVC warning 2017-03-29 10:11:46 +02:00
Simon Grätzer 8b832fe746 Moved to KeyBounds for edge prefix 2017-03-29 10:07:12 +02:00
Simon Grätzer 08047ab5e6 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 09:47:49 +02:00
Simon Grätzer 9ba5586f32 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
# Conflicts:
#	arangod/RocksDBEngine/CMakeLists.txt
 2017-03-29 09:47:41 +02:00
jsteemann 383239a14f Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 09:17:44 +02:00
jsteemann 38ac3c23c8 fixed serialization bug 2017-03-29 09:17:23 +02:00
jsteemann f728fcdbb8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 02:41:00 +02:00
jsteemann e3ca787992 warn before we run out of file descriptors 2017-03-29 02:35:46 +02:00
Dan Larkin 8c024574d2 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-28 19:18:05 -04:00
Dan Larkin c1c7b27af0 Fixed RocksDBPrimaryIndex API. 2017-03-28 19:17:58 -04:00
jsteemann 75daeab31b updated CHANGELOG 2017-03-29 01:17:03 +02:00
jsteemann d4752433f0 slightly simplify logging 2017-03-29 01:16:55 +02:00
jsteemann f8a01fae54 comments 2017-03-29 01:06:47 +02:00
jsteemann fcd54f7a17 get rid of compile warning 2017-03-29 01:03:07 +02:00
Dan Larkin 00bea4f93c Removed RocksDBPrimaryMockIndex. 2017-03-28 18:54:42 -04:00
jsteemann d0766688f3 properly tag geo index tests, and include the long running geo index tests by default 2017-03-29 00:54:24 +02:00