1
0
Fork 0
Commit Graph

31 Commits

Author SHA1 Message Date
Frank Celler 6936972d08 updated disclaimer 2014-06-20 16:41:35 +02:00
Jan Steemann 8a5c2438b9 removed tabs 2014-05-14 18:01:40 +02:00
Frank Celler 0684d0bda4 added vista locks
Conflicts:
	GNUmakefile
	lib/BasicsC/locks-win32.c
	lib/BasicsC/locks-win32.h
2014-03-05 14:22:27 +01:00
Max Neunhoeffer 317304542a Remove index garbage collector. 2013-11-25 10:57:23 +01:00
Jan Steemann 4e1028d791 fixed doxygen error 2013-11-20 01:50:53 +01:00
Jan Steemann af6da9a652 issue #662: ArangoDB on Windows hanging 2013-11-19 16:27:26 +01:00
Jan Steemann d6c0fb36a6 windows condition variables 2013-11-13 21:01:53 +01:00
Jan Steemann 06f6670288 simplified condition variables 2013-11-13 19:03:16 +01:00
Frank Celler ebca4c601e Merge remote-tracking branch 'origin/devel' into 1.4 2013-10-29 11:18:27 +01:00
Jan Steemann 72a2a487d3 some fixes for issue #642 2013-10-28 14:34:37 +01:00
Jan Steemann 441c518593 fixed broken file after merge 2013-09-05 15:07:22 +02:00
Frank Celler 055e172bdb Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4
Conflicts:
	arangod/Replication/Syncer.cpp
	arangod/VocBase/index-garbage-collector.c
	build_posix.h
	html/admin/api-docs/traversal.json
	js/apps/aardvark/api-docs/collection.json
	js/apps/aardvark/api-docs/cursor.json
	js/apps/aardvark/api-docs/document.json
	js/apps/aardvark/api-docs/edge.json
	js/apps/aardvark/api-docs/edges.json
	js/apps/aardvark/api-docs/graph.json
	js/apps/aardvark/api-docs/index.json
	js/apps/aardvark/api-docs/replication.json
	js/apps/aardvark/api-docs/simple.json
	js/apps/aardvark/api-docs/system.json
2013-09-05 13:03:07 +02:00
Jan Steemann aa4aa7bf95 issue #582: ifdef'd unused feature 2013-09-01 12:13:11 +02:00
Jan Steemann b2575376bc issue #582: ifdef'd unused feature 2013-08-21 12:56:04 +02:00
Oreste Panaia 532c7eae8e windows dev update 2013-04-29 21:24:57 +08:00
Oreste Panaia 8333858eac CAS modifications 2013-03-18 19:11:18 +08:00
Oreste Panaia c8ea7ddc8b prepartion for skiplist transactions 2013-03-15 18:26:15 +08:00
Oreste Panaia 36733eb19f preparation for skiplists supporting transactions 2013-03-15 18:12:20 +08:00
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01:00
Oreste Panaia 586a10ef2c final merge errors 2013-03-01 18:19:30 +08: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
Frank Celler 45c815b7eb fixed issue #403: Usage of exit() etc. 2013-02-15 12:19:09 +01:00
Oreste Panaia c4f6465ee7 attempt to link icu libraries into arango 2013-01-22 23:04:16 +08:00
Frank Celler 503e0ff8fe fixed merge conflicts 2013-01-02 18:07:57 +01:00
Jan Steemann 8e201eba20 added #error markers for Windows 2012-12-10 15:50:02 +01:00
Oreste Panaia 857b66c490 windows version 2012-12-06 20:44:01 +08:00
Oreste Panaia aad73db128 various changes for windows 2012-10-22 20:51:31 +08:00
Jan Steemann 3ae11903e8 fixed a deadlock between compactor, synchroniser, and data modification threads (e.g. POST /_api/document) 2012-09-12 00:57:12 +02:00
Jan Steemann 62847ba88a fixed typos in comments 2012-09-10 18:16:07 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00