1
0
Fork 0
Commit Graph

39481 Commits

Author SHA1 Message Date
Dan Larkin e3609dbabf Added proper RocksDBPrimaryIndex implementation. 2017-03-28 18:52:09 -04:00
baslr 7f92c26774 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-29 00:29:16 +02:00
jsteemann e1aef394d8 delete useless DEV_TIMERS, fix rwlockcpp11 2017-03-28 22:38:27 +02:00
Simon Grätzer 94e99c28c9 Added PathBasedIndex 2017-03-28 21:50:03 +02:00
jsteemann eefdb2542d honor cppcheck results 2017-03-28 21:42:34 +02:00
mpv1989 f6bcfc2380 docs: explain CORS credentials usage 2017-03-28 21:04:07 +02:00
mpv1989 43cb5fc81b Merge branch 'feature/cors' into devel 2017-03-28 20:37:30 +02:00
mpv1989 335dd44d1a document CORS changes 2017-03-28 20:34:32 +02:00
Dan Larkin 06953bdd1d Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-28 13:57:16 -04:00
Dan Larkin 1b504b66c2 Added RocksDBKeyBounds class to handle left/right prefixes. 2017-03-28 13:57:07 -04:00
mpv1989 f3ebf247b0 automatically add CORS response headers 2017-03-28 19:48:46 +02:00
Wilfried Goesgens ffc3d6a515 - move runInArangosh over to test-utils, so its right next to runThere.
- use runInArangosh for the replication tests, so they show proper result reports.
2017-03-28 19:05:00 +02:00
jsteemann 2ff83c7fa9 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 17:59:47 +02:00
jsteemann f4ce81f2e3 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 17:59:32 +02:00
Dan Larkin 9b259d91fa Added comparator to engine/index. 2017-03-28 11:58:04 -04:00
jsteemann a221d30b8f added savepoints 2017-03-28 17:55:25 +02:00
Dan Larkin 77c95181d8 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-28 11:42:59 -04:00
Dan Larkin 3ec6934eb5 Changed RocksDBValue API slightly. 2017-03-28 11:42:52 -04:00
Simon Grätzer d5d4cae724 Added read options to edge index 2017-03-28 17:41:49 +02:00
Simon Grätzer b1f010e33c Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
# Conflicts:
#	arangod/RocksDBEngine/RocksDBTransactionState.h
2017-03-28 17:23:38 +02:00
Simon Grätzer 913b60c983 Fix usleep 2017-03-28 17:15:05 +02:00
Jan Christoph Uhde 6a39e962bd Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
* 'engine-api' of https://github.com/arangodb/arangodb:
  add RocksDBIndex as base class for rocksdb-based indexes
  fixed issue #2400
  fixed issue: #2389
2017-03-28 17:00:00 +02:00
Jan Christoph Uhde 7b48e45fa2 add readOptions to transaction 2017-03-28 16:59:39 +02:00
jsteemann 9e15fb4f35 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 16:59:22 +02:00
jsteemann c986590384 add RocksDBIndex as base class for rocksdb-based indexes 2017-03-28 16:56:29 +02:00
Wilfried Goesgens 476befc9d0 refactor testing.js
- split utility functionality into its own file
 - add module loader so we can have modules
 - move all testsuites into own files
 - remove complicated testcase joining / splitting methods
2017-03-28 16:29:51 +02:00
mpv1989 4b8c880486 added OPTIONS to cors methods header 2017-03-28 16:18:53 +02:00
Jan Christoph Uhde 1b5cefddd3 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
* 'engine-api' of https://github.com/arangodb/arangodb:
  Fix build error
  Adding RocksDBPrimaryMockIndexIterator
2017-03-28 15:51:05 +02:00
Jan Christoph Uhde 4b33614e12 Avoid one copy during document lookup for RocksDBEngine 2017-03-28 15:50:09 +02:00
Simon Grätzer 7fd102692f Fix build error 2017-03-28 15:16:08 +02:00
Simon Grätzer c592f911f3 Adding RocksDBPrimaryMockIndexIterator 2017-03-28 15:10:00 +02:00
hkernbach 2b0bd3cd5e changelog 2017-03-28 14:57:36 +02:00
Jan Christoph Uhde 965026ec6b Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
* 'engine-api' of https://github.com/arangodb/arangodb:
  Fixed RocksDBAllIndexIterator
2017-03-28 14:55:58 +02:00
Jan Christoph Uhde c6111ac8e3 silence warinings 2017-03-28 14:55:19 +02:00
Simon Grätzer aa1b443d85 Fixed RocksDBAllIndexIterator 2017-03-28 14:53:16 +02:00
Jan Christoph Uhde 31c52f60ff Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
* 'engine-api' of https://github.com/arangodb/arangodb:
  Added RocksDBPrimaryMockIndexIterator
2017-03-28 14:52:59 +02:00
Jan Christoph Uhde 3c31ec2314 add function for looking up revisions to collection 2017-03-28 14:49:19 +02:00
Simon Grätzer 5e630d818f Added RocksDBPrimaryMockIndexIterator 2017-03-28 14:37:33 +02:00
hkernbach 0a9ed38b6a ui - bugfix smart graph selection missing 2017-03-28 14:22:45 +02:00
Andreas Streichardt f32256e5a7 Normalize test resultstructure (hopefully) 2017-03-28 14:15:08 +02:00
Alan Plum d8d844ae44
git ignore .vscode
[skip ci]
2017-03-28 14:12:32 +02:00
Simon Grätzer 7a26fb22c1 Pushing commons method 2017-03-28 14:07:01 +02:00
jsteemann 40e4bba260 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 14:03:53 +02:00
Simon Grätzer f5b44d1c12 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 14:02:35 +02:00
Simon Grätzer 9e1a181393 Edge index tax changes 2017-03-28 14:02:29 +02:00
baslr 3161fdc6f8 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-28 14:02:16 +02:00
jsteemann 467307fd07 fixed issue #2400 2017-03-28 13:58:49 +02:00
jsteemann e9e0d3a46c remove unused attribute 2017-03-28 13:25:10 +02:00
jsteemann 2e178d4378 make _objectId const 2017-03-28 13:25:03 +02:00
jsteemann 6d74274d6a Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 12:09:09 +02:00