1
0
Fork 0
Commit Graph

103 Commits

Author SHA1 Message Date
Jan Steemann b7b6dafce9 removed libraryloader 2014-06-02 15:46:54 +02:00
Jan Steemann 2c934cf1aa Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
2014-06-02 09:52:05 +02:00
Jan Steemann 5962e9dfc4 added std::19337 2014-05-31 02:56:18 +02:00
Max Neunhoeffer ff1dfdd55f Header cleanup: use #include "Basics/Common.h" in all C++ files. 2014-05-21 15:50:30 +02:00
Max Neunhoeffer 50783b36c8 program-options.c -> program-options.cpp 2014-05-21 14:50:52 +02:00
Max Neunhoeffer 77025348df Make JsonParser C++, however, functions still extern "C". 2014-05-21 13:56:45 +02:00
Max Neunhoeffer 67f32ec430 Activate Legends.cpp in Makefile 2014-05-20 13:29:34 +02:00
Max Neunhoeffer 0dab3706c5 Finish first version of JsonLegend, not activated in Makefile. 2014-05-20 13:27:57 +02:00
Max Neunhoeffer b5df264cdb First draft of legend generator. 2014-05-20 13:27:09 +02:00
Esteban Lombeyda eaa39427f9 Compiling under linux 2014-05-16 15:19:54 +02:00
Jan Steemann b922c74ab7 removed unused Url class 2014-04-04 10:23:41 +02:00
Jan Steemann 9aaeafda10 cpp 2014-04-04 10:21:54 +02:00
Max Neunhoeffer 185d86c04f Snapshot before moving to indices in associative-multi. 2014-03-26 15:12:36 +01:00
Max Neunhoeffer 523029e190 Use only hash lengths that are prime numbers. 2014-03-24 14:07:00 +01:00
Frank Celler 42fb8244e1 added requeue 2014-02-25 12:07:16 +01:00
Max Neunhoeffer 5c467148a3 Add HTTP REST API call for shutdown. 2014-02-12 10:47:43 +01:00
Jan Steemann e9c5af7895 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsView.css
	js/apps/system/aardvark/frontend/css/layout.css
	js/apps/system/aardvark/frontend/js/routers/router.js
2014-01-30 19:40:21 +01:00
Frank Celler 973f9aa2fb added linenoise 2014-01-30 17:23:24 +01:00
Max Neunhoeffer fc96df2244 Separate out ConnectionManager from ClusterComm. 2014-01-14 15:04:55 +01:00
Frank Celler 84507cfc44 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Frank Celler 9ac2e751c6 fixed wrong ifdefs and missing constructor for Logger 2013-12-22 14:58:51 +01:00
Max Neunhoeffer 3464f31bf1 Add generic skip list functionality. 2013-11-18 14:55:52 +01:00
Jan Steemann 4f50b98c45 removed second logger implementation 2013-10-30 00:38:25 +01:00
Jan Steemann 5a422becd8 async job management 2013-09-26 17:30:03 +02:00
Jan Steemann b8236bc218 replaced numFields 2013-09-20 08:27:03 +02:00
Jan Steemann 369433f1e2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/SimpleHttpClient/SimpleHttpClient.cpp
2013-09-05 12:34:45 +02:00
Jan Steemann 0689d5cc5f removed dead files 2013-08-27 12:47:23 +02:00
Jan Steemann 054ed3ca3f apply collection data dumps 2013-07-05 11:41:37 +02:00
Jan Steemann ed77c19e16 added derived file 2013-05-17 15:59:58 +02:00
Oreste Panaia 532c7eae8e windows dev update 2013-04-29 21:24:57 +08:00
Oreste Panaia 1ddbd2e4d9 update 2013-04-23 19:02:46 +08:00
Oreste Panaia b83d90f021 skiplist transaction support 2013-04-23 18:56:26 +08:00
Frank Celler d2ea4e9bd2 added SlowBuffer from node 2013-04-21 21:32:32 +02:00
Frank Celler f810711a79 FreeBSD port 2013-04-02 18:43:10 +02:00
Jan Steemann 909c316e22 added mimetype generation file 2013-03-27 10:11:56 +01:00
Jan Steemann 76a86a853f fixed build? 2013-03-24 10:43:55 +01:00
Jan Steemann 37f364e70e added internal.download() 2013-03-24 01:04:26 +01:00
Jan Steemann 91fbb454f3 added zipFile() 2013-03-23 22:32:59 +01:00
Jan Steemann d97954e466 unzip 2013-03-23 20:52:33 +01:00
Jan Steemann 5cf913b2ca zlib 2013-03-23 19:13:31 +01:00
Jan Steemann b66a7492b9 addendum for issue #443 2013-03-08 22:30:35 +01:00
Jan Steemann b7086fe93d removed unused fe-configuration handler 2013-03-08 20:26:06 +01:00
a-brandt d6392971bf Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-04 09:06:45 +01:00
Frank Celler 60037971dc rewrote statistics 2013-03-03 22:39:41 +01:00
a-brandt c4bdb201b5 added Nonce.cpp 2013-03-01 16:49:22 +01:00
Oreste Panaia e0b7fbbf8d windows icu 2013-01-31 00:04:20 +08:00
Jan Steemann b416bc1a4b removed JsonContainer, introduced more general ResourceHolder class 2012-11-16 13:29:19 +01:00
Jan Steemann 6b6b692592 cleaned up v8 function creation 2012-11-12 09:30:51 +01:00
Oreste Panaia 4d8d78e880 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	VisualStudio/Arango Front End Library/Arango Front End Library.vcxproj
	arangod/Actions/RestActionHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	lib/ApplicationServer/ApplicationServer.cpp
2012-10-22 21:04:12 +08:00
Oreste Panaia aad73db128 various changes for windows 2012-10-22 20:51:31 +08:00