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

86 Commits

Author SHA1 Message Date
Jan Steemann b903d9080d Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	js/apps/system/aardvark/test/karma/karma.conf.js
 2013-12-20 15:35:50 +01:00
Jan Steemann 7c4944de83 added --server.ssl-protocol option for client tools 
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/GeneralServer/SslAsyncCommTask.h
 2013-12-13 17:58:24 +01:00
Jan Steemann f0184d2786 not sure about the restshardhandler yet 2013-12-12 17:51:45 +01:00
Jan Steemann 8eccb0a35f added dispatcher to shardhandler 2013-12-12 16:42:25 +01:00
Jan Steemann 0014777746 improve error message 2013-10-30 14:38:20 +01:00
Jan Steemann 4f50b98c45 removed second logger implementation 2013-10-30 00:38:25 +01:00
Jan Steemann 709198c340 updated docs for /_api/jobs 2013-09-28 00:44:03 +02:00
Jan Steemann e3d9d95f3f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	lib/Admin/ApplicationAdminServer.cpp
	lib/GeneralServer/GeneralServerDispatcher.h
 2013-09-26 17:46:05 +02:00
Jan Steemann 5a422becd8 async job management 2013-09-26 17:30:03 +02:00
Jan Steemann 106fedd615 several errors fixed 2013-09-26 09:44:50 +02:00
Jan Steemann 73f0405ead added documentation for endpoints 2013-09-23 16:21:02 +02:00
Jan Steemann ed163164c4 fixed queue naming 2013-09-20 13:17:32 +02:00
Jan Steemann 6902ae5670 added support for async requests 2013-09-20 12:32:46 +02:00
Jan Steemann 2eb0871813 updated TODOs 2013-09-12 18:46:19 +02:00
Jan Steemann 6ff314de0e runtime addition and removal of endpoints 2013-09-12 18:07:39 +02:00
Jan Steemann a53c1e493b multiple database, becoming standard 2013-09-02 09:52:52 +02:00
Jan Steemann 5ba876978b removed unused private variable (fixes compiler warning) 2013-06-28 15:44:59 +02:00
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01:00
Oreste Panaia fc5e1ba623 merge conflicts with devel 2013-02-28 19:42:58 +08:00
Oreste Panaia a48696ec28 network modifications required for windows 2013-02-28 17:43:39 +08:00
Oreste Panaia 9e69106c90 Merge branch '1.2' of https://github.com/triAGENS/ArangoDB into 1.2 2013-02-22 16:58:06 +08:00
Oreste Panaia ea601a23b3 Socket changes for windows libev 2013-02-22 16:51:13 +08:00
Frank Celler 2553b572ab fixed mode 2013-02-21 14:14:20 +01:00
Oreste Panaia 2c12f63d7f libev interface 2013-02-19 20:58:21 +08:00
Frank Celler 069dcdfc94 changed logging of fatal errors 2013-02-14 16:47:35 +01:00
Frank Celler 503e0ff8fe fixed merge conflicts 2013-01-02 18:07:57 +01:00
Jan Steemann 459f935d00 intptr_t to uintptr_t conversion 2013-01-02 15:00:59 +01:00
Oreste Panaia 83ded3fc1f windows fixes 2012-12-20 17:17:30 +08:00
Oreste Panaia 857b66c490 windows version 2012-12-06 20:44:01 +08:00
Oreste Panaia aac17f7b55 wrapper for memory mapped files add 2012-10-05 18:31:13 +08:00
Oreste Panaia fd497eccae VS 2012-09-28 23:46:33 +08:00
Oreste Panaia 6bdf3ae565 usual mysteries with git 
Conflicts:
	lib/Rest/Endpoint.cpp
 2012-09-28 17:56:05 +08:00
Oreste Panaia 2a71a3c371 minor changes for windows compatability 2012-09-28 17:34:22 +08:00
Jan Steemann 68ee67afd8 fixed SSL endless wait when data sent was bigger than readBuffer 2012-09-27 13:46:14 +02:00
Frank Celler 5c32ae5869 removed boost exceptions 2012-09-13 15:09:02 +02:00
Frank Celler d26b082ef6 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Makefile.in
	UnitTests/Makefile.files
 2012-08-24 09:59:16 +02:00
Jan Steemann 4b16882b44 issue #131: make keep alive timeout configurable 2012-08-20 15:42:11 +02:00
Frank Celler fa41864b7a Merge remote-tracking branch 'origin/1.0' into devel 
Conflicts:
	Installation/MacOSX/MacPorts/arango.conf
	Installation/arangod.conf.in
	Makefile.in
	arangod/RestServer/ArangoServer.h
	configure
	lib/V8/v8-utils.cpp
 2012-08-18 09:00:43 +02:00
Jan Steemann 1278f6e8ea issue #131: added basic keep-alive timeout 2012-08-06 18:20:46 +02:00
Jan Steemann 3d019115cf removed http dependencies 2012-07-30 17:15:22 +02:00
Jan Steemann 020480bfe7 binary listeners are now started, but do not work 2012-07-30 16:01:25 +02:00
Jan Steemann acdfbf8a20 more refactoring 2012-07-30 15:37:54 +02:00
Jan Steemann 603747b024 refactoring 2012-07-30 14:56:02 +02:00
Jan Steemann 886739a679 further refactoring of HttpServer 2012-07-30 14:48:12 +02:00
Jan Steemann 7af489934e some refactoring of http and https servers 2012-07-30 14:07:59 +02:00
Jan Steemann 3b7b14454c added abstract EndpointServer, starting to combine ApplicationHttpServer and ApplicationHttpsServer 2012-07-27 15:38:27 +02:00
Jan Steemann 8d8044ba47 added proper SSL support for arangosh and arangoimp 2012-07-25 17:47:54 +02:00
Jan Steemann 33839809ab ssl 2012-07-23 18:17:45 +02:00
Jan Steemann 9a72ea4496 added https@ and http@ endpoints, https still unfinished 2012-07-23 17:32:59 +02:00
Jan Steemann a40b1ed511 renamed classes 2012-07-23 15:58:08 +02:00