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

1039 Commits

Author SHA1 Message Date
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 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 369433f1e2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/SimpleHttpClient/SimpleHttpClient.cpp
 2013-09-05 12:34:45 +02:00
Jan Steemann 073745a5fe added --keep-alive option for arangob, improved output of arangob 2013-09-04 23:56:13 +02:00
Jan Steemann ca2f5feb4b fixed redirect URLs 2013-09-04 17:30:37 +02:00
Jan Steemann 435e949462 fixed redirections in web interface 2013-09-04 15:58:41 +02:00
Jan Steemann 05a88d3477 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-09-02 15:58:22 +02:00
Jan Steemann 356482831c fix ambiguity bug 2013-09-02 15:56:12 +02:00
Jan Steemann 42b8dfca49 added --server.database option for client tools 2013-09-02 13:02:53 +02:00
Jan Steemann a53c1e493b multiple database, becoming standard 2013-09-02 09:52:52 +02:00
Jan Steemann aa4aa7bf95 issue #582: ifdef'd unused feature 2013-09-01 12:13:11 +02:00
Jan Steemann 2c4ad55db1 don't call getenv in loop 2013-08-29 22:08:10 +02:00
Jan Steemann 2556b0714f fixed issues reported by VS 2012 2013-08-29 16:43:56 +02:00
Jan Steemann efcca7ab90 54 => 64 2013-08-29 13:53:20 +02:00
Jan Steemann 4e496b9dc5 migration from /_admin/html to /_admin/aardvark 2013-08-29 13:19:50 +02:00
Jan Steemann 0aca109a89 removed html/admin, / now redirects to /_admin/aardvark by default 2013-08-29 12:59:56 +02:00
Jan Steemann e72c6ab20c fixed a memleak in /_api/replication/dump 2013-08-29 11:46:33 +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
Jan Steemann 405770620d indentation 2013-08-28 09:18:39 +02:00
Jan Steemann b94ee1042c cppcheck 2013-08-27 16:13:44 +02:00
Jan Steemann 08f09a6bc7 do not flush log messages after initialisation 2013-08-27 13:26:00 +02:00
Jan Steemann 0689d5cc5f removed dead files 2013-08-27 12:47:23 +02:00
Jan Steemann 3efd6f46af change signatures of static functions 2013-08-27 12:17:49 +02:00
Jan Steemann fb76008108 added TRI_WriteFile convenience function 2013-08-27 12:17:19 +02:00
Jan Steemann 7b422e6f4a added convenience functions 2013-08-26 19:38:12 +02:00
Frank Celler 09460a10a3 updated mruby to 2013-08-22 
Conflicts:
	configure
 2013-08-22 21:03:04 +02:00
Frank Celler 5e1e2fc30c updated mruby to 2013-08-22 2013-08-22 20:58:19 +02:00
Jan Steemann 156f3b0d9e added upgrade notes 2013-08-22 15:21:21 +02:00
Jan Steemann 9b8b030a8a added several tests for authentication 2013-08-22 11:18:11 +02:00
Jan Steemann 38abd5bf9e issue #576 2013-08-21 14:02:09 +02:00
Jan Steemann b2575376bc issue #582: ifdef'd unused feature 2013-08-21 12:56:04 +02:00
Jan Steemann 3871fb7af3 improved error messages 2013-08-20 11:48:08 +02:00
Jan Steemann 1a6f3c2981 added new error codes 2013-08-20 11:12:08 +02:00
Jan Steemann 5056512a37 mimetypes for fonts 2013-08-20 10:03:38 +02:00
Jan Steemann 01bc494493 merged single commits by @guidoreina 2013-08-19 10:02:37 +02:00
Guido Reina 011117edee In the function: TRI_LocateBinaryPath(), "binaryPath" was duplicated from "dir" and then "dir" freed. Better just to assign to "binaryPath" the result of TRI_Dirname(). 2013-08-16 06:55:43 +02:00
Guido Reina 72c8847324 In the function: RemoveAllLockedFiles(void), if we call TRI_RemoveVectorString() and TRI_RemoveVector() the next elements in the vector will be memmoved to the left. The next iteration of the loop will check the element at position 1 (but we are skipping the new element at position 0), so these calls have been removed. 
The other alternative would be to have a loop: while (FileNames._length > 0) and take always the element at position 0. But this has the disadvantage that we are performing memmove() when later the vectors will be freed anyway.
 2013-08-15 18:36:41 +02:00
Guido Reina 5da5715fa9 Merge branch 'experiment' of https://github.com/guidoreina/ArangoDB into experiment 2013-08-13 20:07:17 +02:00
Guido Reina a371aac4af In the function TRI_StringInt8InPlace, when attr == INT8_MIN, it was copying only 4 bytes instead of 5 and it was returning 3 instead of 4. 2013-08-13 20:02:25 +02:00
Jan Steemann bfc6648588 added server startup options `--server.disable-replication-logger` and `--server.disable-replication-applier` 2013-08-02 16:17:51 +02:00
Jan Steemann 5f1bfcf9cd documentation for replication 2013-08-02 15:28:30 +02:00
Jan Steemann 1fc1bb108d added replication client tests 2013-08-02 11:45:55 +02:00
Jan Steemann 949c194653 updated replication configuration 2013-08-01 15:50:30 +02:00
Jan Steemann 48fbdb1b6a cap constraint for replication logger 2013-07-31 16:56:56 +02:00
Jan Steemann 05a7f79941 re-configuration of logger, cap constraint 2013-07-31 14:39:33 +02:00
Jan Steemann 936fb6c6a6 better progress reports for replication applier 2013-07-31 10:01:56 +02:00