1
0
Fork 0
Commit Graph

33263 Commits

Author SHA1 Message Date
Wilfried Goesgens 1c34b564ed Fix release matching for alpha/beta versions 2016-08-30 14:39:48 +02:00
Jan Christoph Uhde add0a26228 Merge branch 'obi-velocystream' of github.com:arangodb/arangodb into obi-velocystream
* 'obi-velocystream' of github.com:arangodb/arangodb:
  renamed method
2016-08-30 14:20:27 +02:00
jsteemann 09b611100c Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 13:46:01 +02:00
jsteemann bdd9d1422e bugfixes 2016-08-30 13:45:54 +02:00
Michael Hackstein d6a21b20e3 Fixed creation of keyGenerator. It was not extracted correctly from the parameters 2016-08-30 13:31:53 +02:00
Michael Hackstein 294fa10e14 Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-08-30 13:08:40 +02:00
Michael Hackstein 2f7f3e0fe0 Fixed creation of system collections without System name 2016-08-30 13:05:33 +02:00
jsteemann fab835c63a Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 13:02:14 +02:00
jsteemann cf42f5dbc8 fix leaks 2016-08-30 13:02:04 +02:00
jsteemann d95f1773c4 fix leaks 2016-08-30 13:01:50 +02:00
jsteemann 672255fad7 removed some TRI_collection_t instances 2016-08-30 13:01:34 +02:00
jsteemann 61d11fd71c acquire lock later 2016-08-30 13:00:17 +02:00
jsteemann bc9d0e74d5 unprepare features on abort 2016-08-30 12:59:15 +02:00
Wilfried Goesgens 9b21d403ea We mustn't use minuses in the releases since that will collide later on with packaging. 2016-08-30 12:57:08 +02:00
Jan Christoph Uhde b340546023 update my scripts 2016-08-30 12:33:05 +02:00
jsteemann 7dfaf0d3f4 remove superfluous _infoLock 2016-08-30 11:54:04 +02:00
jsteemann a7cf45342f removed unused methods 2016-08-30 11:41:50 +02:00
jsteemann e227d670f0 Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 11:30:14 +02:00
jsteemann 983fca3b56 removed unused methods 2016-08-30 11:29:58 +02:00
Wilfried Goesgens c2c774fcc8 Pass arguments along to build.sh 2016-08-30 11:23:01 +02:00
Michael Hackstein 9c0382ed19 Now also the journalSize is checked if it is too small. Also reverted report message for isVolatile to be equal to the pre 3.1 message. 2016-08-30 11:18:36 +02:00
Michael Hackstein 5f067cb1fb Fixed creation of volatile collections. They can now again not waitForSync at the same time. 2016-08-30 11:11:25 +02:00
jsteemann 955e0812cf Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 11:02:59 +02:00
Michael Hackstein 0f85af77b4 Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-08-30 11:02:42 +02:00
Wilfried Goesgens 0601cc2661 Fix windows NSIS client package 2016-08-30 10:57:41 +02:00
Wilfried Goesgens 84b164b985 fix typo 2016-08-30 10:57:30 +02:00
Wilfried Goesgens c3ed09f642 Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline 2016-08-30 10:52:17 +02:00
Wilfried Goesgens 9e41587d44 - properly use armhf for armv7 packages
- specify CPACK_DEBIAN_PACKAGE_ARCHITECTURE so one can cx-compile packages.
2016-08-30 10:51:29 +02:00
jsteemann 2134afaa83 renamed method 2016-08-30 10:36:34 +02:00
Michael Hackstein 82edb8707a Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-08-30 10:12:36 +02:00
jsteemann b5749c12e0 oops 2016-08-30 09:47:15 +02:00
jsteemann 5964ffce78 fixed some tests 2016-08-30 09:36:43 +02:00
jsteemann bd590fb62d Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 08:18:34 +02:00
Jan Christoph Uhde 8e38600369 fix RestExportHandler 2016-08-29 21:27:05 +02:00
Jan Christoph Uhde d8be2b4079 fix: RestcursorHandler 2016-08-29 20:33:37 +02:00
Michael Hackstein 7cf7b89c6d Removed more usage of VocbaseCollectionInfo and replaced it by LogicalCollection. It's getting better now. State still not green. 2016-08-29 18:44:34 +02:00
Kaveh Vahedipour c53428ce89 minor fixes 2016-08-29 17:13:33 +02:00
jsteemann 89e047283b Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-29 17:06:20 +02:00
jsteemann 31809ac283 fixes for revision id 2016-08-29 17:06:07 +02:00
Wilfried Goesgens b24a469974 Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline 2016-08-29 16:35:06 +02:00
Wilfried Goesgens 0e36f95f1a fix effect that on second install we will complain about mismatching passwords 2016-08-29 16:34:17 +02:00
Wilfried Goesgens 1be060bc98 only test for cleaning up 3rdparty if we're parametrized to do so. 2016-08-29 16:17:14 +02:00
jsteemann 6055acbb35 simplified 2016-08-29 16:04:39 +02:00
jsteemann d438399034 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-29 15:43:25 +02:00
jsteemann 9e708112a6 privatize some TRI_datafile_t internals 2016-08-29 15:43:03 +02:00
Jan Christoph Uhde 656ceb873d add vpack version of cursor.dump() 2016-08-29 14:20:42 +02:00
Jan Christoph Uhde abdb06a177 fix CMake so it finds the PythonInterpreter even with oder versions 2016-08-29 13:22:03 +02:00
jsteemann b9f8709104 renamed GeoIndex2 to GeoIndex 2016-08-29 13:02:07 +02:00
jsteemann 8fac72e8d6 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-29 12:52:47 +02:00
jsteemann b3ef2c8206 fix some leaks 2016-08-29 12:48:02 +02:00