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

409 Commits

Author SHA1 Message Date
Frank Celler 11e2a51e78 alternative version if mruby supports define_method and attrib_reader 2012-06-12 17:33:27 +02:00
Frank Celler dd7fa848c0 alternative version if mruby supports define_method and attrib_reader 2012-06-12 17:28:53 +02:00
Frank Celler 0a17415a01 preparations for ZeroMQ, removed Scheduler and Dispatcher from ApplicationServer 2012-06-12 17:11:12 +02:00
Jan Steemann 2e0edb9a79 added #ifdef, otherwise compilation fails 2012-06-11 12:06:30 +02:00
Frank Celler bb9253eeff fixed queue handling for MRuby, added mount for MRuby and mr_action_t 2012-06-09 11:15:18 +02:00
Frank Celler 55ebf00dbd Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	Actions/RestActionHandler.cpp
	Actions/RestActionHandler.h
	Makefile.files
	Makefile.in
	RestHandler/RestActionHandler.cpp
	RestHandler/RestActionHandler.h
	RestServer/ActionDispatcherThread.cpp
	RestServer/ActionDispatcherThread.h
	RestServer/RubyDispatcherThread.cpp
	RestServer/RubyDispatcherThread.h
	arangod/RestHandler/RestActionHandler.cpp
	arangod/RestHandler/RestActionHandler.h
	arangod/RestServer/ActionDispatcherThread.cpp
	arangod/RestServer/ActionDispatcherThread.h
	arangod/RestServer/ArangoServer.cpp
 2012-06-08 15:57:33 +02:00
Frank Celler efcfbccc7a the great rename IV 2012-06-08 15:25:16 +02:00
Frank Celler 313c3c31ed Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangosh/V8Client/arangosh.cpp
 2012-06-08 15:13:01 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00