1
0
Fork 0
Commit Graph

18 Commits

Author SHA1 Message Date
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
Jan Steemann 9e21cf9b7e added configure option --enable-cluster 2013-12-10 14:46:16 +01:00
Frank Celler b6b381c663 moved TRI_ENABLE_MRUBY to command line 2013-10-20 18:46:31 +02:00
Jan Steemann 002ebd48bc removed all replication conditionals 2013-07-30 13:16:37 +02:00
Jan Steemann 6e9c3e8e2c replication logging 2013-06-26 12:04:55 +02:00
Jan Steemann 1ea4c1c4b0 issue #443 2013-03-08 15:16:29 +01:00
Jan Steemann 092327058b potential solution for #438 (non-windows) 2013-03-07 10:50:40 +01:00
Jan Steemann 81f79315d1 removed configure option --enable-zone-debug 2013-02-22 15:54:14 +01:00
Jan Steemann 47ad5e1139 removed dead configure option for 1.2 2013-01-30 13:19:20 +01:00
Jan Steemann d9f8219bd6 added --enable-trx option 2012-10-31 11:21:06 +01:00
Jan Steemann a08b5ac230 remove configure option --enable-lock-check. has done its purpose already 2012-10-10 14:21:25 +02:00
Jan Steemann 10d6167d45 removed some unused compile options 2012-09-25 21:24:02 +02:00
Jan Steemann 4587d5db3c added configure option --enable-lock-check 2012-09-10 18:17:57 +02:00
Frank Celler 39f4a8f833 cleanup directory structure and init file handling
moved common functions to ArangoClient
2012-08-30 16:54:42 +02:00
Frank Celler 84903ace48 added log option 2012-07-04 23:02:45 +02:00
Frank Celler 3f5b54258b partial ZeroMQ integration 2012-06-13 11:39:00 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00