1
0
Fork 0
Commit Graph

488 Commits

Author SHA1 Message Date
Jan Steemann 042b805ce4 fixed Windows file handling 2013-11-11 20:30:23 +01:00
Jan Steemann 3bc6b42003 fixed comment 2013-11-11 20:06:41 +01:00
Jan Steemann fabf66d77c changed return codes 2013-11-06 11:24:13 +01:00
Jan Steemann b720b49a8c issue #642: renamed macro from TRI_WARN_UNUSED to TRI_WARN_UNUSED_RESULT 2013-10-30 12:19:26 +01:00
Jan Steemann 2a9205527f simplify logging 2013-10-30 01:07:02 +01:00
Jan Steemann 4f50b98c45 removed second logger implementation 2013-10-30 00:38:25 +01:00
Jan Steemann c751cc80fc issue #642 2013-10-29 21:15:46 +01:00
Frank Celler ebca4c601e Merge remote-tracking branch 'origin/devel' into 1.4 2013-10-29 11:18:27 +01:00
Jan Steemann 723785b5b6 Windows warnings 2013-10-29 10:09:12 +01:00
Jan Steemann 071aa64e15 fixed syntax error on Win 2013-10-29 09:56:24 +01:00
Jan Steemann 057fd91646 lol self 2013-10-29 09:39:36 +01:00
Jan Steemann 0131735f30 issue #621: always print fatal error at the end 2013-10-29 03:01:33 +01:00
Frank Celler d33bcdc623 rc1 2013-10-28 17:54:24 +01:00
Jan Steemann 74926b1c7b issue #621: Standard Config needs to be fixed 2013-10-28 15:07:08 +01:00
Jan Steemann 72a2a487d3 some fixes for issue #642 2013-10-28 14:34:37 +01:00
Frank Celler b6b381c663 moved TRI_ENABLE_MRUBY to command line 2013-10-20 18:46:31 +02:00
Jan Steemann f498f8f03c faster server shutdown 2013-10-18 10:18:46 +02:00
Jan Steemann 0a6148f2d6 fixed some VS complaints 2013-10-16 17:27:35 +02:00
Frank Celler be162a1e35 Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4
Conflicts:
	CHANGELOG
	Documentation/Manual/NewFeatures14.md
	Documentation/Manual/NewFeatures14TOC.md
	Documentation/Manual/Upgrading14.md
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/traversal.json
2013-10-14 14:00:29 +02:00
Jan Steemann b8318609e2 updated arangorestore 2013-10-10 16:58:21 +02:00
Jan Steemann af07091d1c Windows fixes 2013-10-09 15:33:38 +02:00
Jan Steemann e3df92d929 fix Windows file handling 2013-10-09 14:07:21 +02:00
Jan Steemann cc14fb039a fix some VS warnings 2013-10-09 14:05:36 +02:00
Jan Steemann d6149c9a9a added documentation for /_api/import 2013-10-02 14:22:25 +02:00
Frank Celler ad2d4b9d76 Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4
Conflicts:
	VS2012/Arangod Binary/Arangod Binary.vcxproj
	VS2012/Arangoimp Binary/Arangoimp Binary.vcxproj
	VS2012/Arangosh Binary/Arangosh Binary.vcxproj
	arangod/Ahuacatl/ahuacatl-grammar.c
	js/actions/api-database.js
	js/apps/aardvark/api-docs/edges.json
	js/apps/aardvark/api-docs/traversal.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
2013-09-30 14:39:59 +02:00
Jan Steemann 50efbd1243 optimisation for empty arrays 2013-09-26 12:58:19 +02:00
Jan Steemann 467a236187 re-added cache for HTTP authentication data 2013-09-26 11:26:34 +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 8a9ce4e86d fixed memory allocation inefficiency 2013-09-20 17:26:26 +02:00
Jan Steemann 370a1bc5a4 less memory usage 2013-09-19 11:46:21 +02:00
Jan Steemann 5c0fd200f7 more OOM awareness 2013-09-19 08:44:12 +02:00
Jan Steemann 8a996c5b60 less dependency on regex.h, also fixes some speed problems for key validation 2013-09-19 08:20:35 +02:00
Jan Steemann 4aee2df2f3 force usage of --upgrade 2013-09-17 15:56:24 +02:00
Jan Steemann 2eb0871813 updated TODOs 2013-09-12 18:46:19 +02:00
Jan Steemann 4a2626525c async dropping of databases 2013-09-12 11:00:11 +02:00
Jan Steemann 7d5e4f875f runtime configuration of endpoints, unfinished 2013-09-11 18:24:51 +02:00
Jan Steemann 5bc1e5ecea dropping databases, unfinished 2013-09-11 12:47:27 +02:00
Jan Steemann 42441b208f refactoring of multiple databases, intermediate commit 2013-09-11 11:42:34 +02:00
Jan Steemann f65911de53 removed unused error code 2013-09-06 00:55:34 +02:00
Jan Steemann 441c518593 fixed broken file after merge 2013-09-05 15:07:22 +02:00
Jan Steemann 0eebc5b3f1 windows 2013-09-05 15:03:05 +02:00
Jan Steemann 76a3c24c0d windows 2013-09-05 14:59:28 +02:00
Jan Steemann 7c91155bac windows 2013-09-05 14:58:27 +02:00
Jan Steemann dfcf4a3800 don't generate pod2man 2013-09-05 14:23:20 +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 860ed964c3 simplify build.h 2013-08-28 22:20:06 +02:00
Jan Steemann 7cb6b7d922 simplified build.h stuff 2013-08-28 19:57:07 +02:00
Jan Steemann edc71e5424 support for deflate compression 2013-08-28 11:44:49 +02:00