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

94 Commits

Author SHA1 Message Date
Jan Steemann 6ad1ba13cc fixed mutex in key generator 2014-05-22 13:11:23 +02:00
Jan Steemann de14fa5944 removed old CRUD methods 2014-05-22 12:17:51 +02:00
Jan Steemann 5373f1cea0 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/VocBase/edge-collection.h
 2014-05-21 18:06:44 +02:00
Jan Steemann 0caa570274 update() 2014-05-21 18:05:08 +02:00
Max Neunhoeffer ff1dfdd55f Header cleanup: use #include "Basics/Common.h" in all C++ files. 2014-05-21 15:50:30 +02:00
Jan Steemann 2bc4aa90af fixed issues found by scan-build 2014-05-15 10:09:06 +02:00
Max Neunhoeffer df68f47338 Use StringBuffer in SimpleHttpResult rather than stringstream. 2014-05-07 16:35:40 +02:00
Jan Steemann 868c2371ab unified error messages 2014-04-23 23:35:59 +02:00
Jan Steemann d3e57c9e3c issue #826: Replication fails when a collection's configuration changes 2014-04-22 11:31:01 +02:00
Jan Steemann 79defc2ef1 -Wunreachable-code reverted. Visual Studio doesn't like it 2014-03-06 11:36:58 +01:00
Jan Steemann c5c294aa6b -Wunreachable-code 2014-03-06 11:30:38 +01:00
Jan Steemann e968d62367 re-use planId 2014-03-05 15:33:49 +01:00
Jan Steemann be8abb0cc1 allow syncing with 2.0 2014-02-28 22:19:21 +01:00
Jan Steemann 629348d696 properly acquire shape write locks 2014-02-28 18:43:09 +01:00
Jan Steemann 7c4944de83 added --server.ssl-protocol option for client tools 
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/GeneralServer/SslAsyncCommTask.h
 2013-12-13 17:58:24 +01:00
Jan Steemann 8fea8ca1b3 changed write-locks 2013-11-20 01:27:45 +01:00
Jan Steemann f69ae8f2a9 do not access shaper but use memory zone variable 2013-11-08 13:42:16 +01:00
Jan Steemann 4f50b98c45 removed second logger implementation 2013-10-30 00:38:25 +01:00
Frank Celler eea1fea806 fixed build number 2013-10-29 12:58:22 +01:00
Frank Celler ebca4c601e Merge remote-tracking branch 'origin/devel' into 1.4 2013-10-29 11:18:27 +01:00
Jan Steemann f7c65c65dd fixed a warning in Windows 2013-10-29 10:15:19 +01:00
Frank Celler d33bcdc623 rc1 2013-10-28 17:54:24 +01:00
Jan Steemann 21d25d0ccc removed resourceholder 2013-10-17 10:43:07 +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 79f70c7eea replication applier will now preferrably use collection names instead of collection ids when applying events 2013-10-14 13:45:44 +02:00
Jan Steemann b8318609e2 updated arangorestore 2013-10-10 16:58:21 +02:00
Jan Steemann e89b0d539d allow specifying database name for replication sync command and replication applier 2013-10-01 17:59:26 +02:00
Jan Steemann e5bde25f3b make source database name configurable for replication applier 2013-10-01 17:36:30 +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 106fedd615 several errors fixed 2013-09-26 09:44:50 +02:00
Jan Steemann fde7793137 refactored database options 2013-09-11 13:22:52 +02:00
Jan Steemann 42441b208f refactoring of multiple databases, intermediate commit 2013-09-11 11:42:34 +02:00
Jan Steemann ac4ed728c0 renamed collection `_graphs` to `arangodb_graphs` 2013-09-09 11:07:10 +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 1af5aa6b45 block compaction & datafile removal while dumping 2013-08-30 17:25:09 +02:00
Jan Steemann 6c64a35895 restore client, unfinished 2013-08-30 01:14:21 +02:00
Jan Steemann e72c6ab20c fixed a memleak in /_api/replication/dump 2013-08-29 11:46:33 +02:00
Jan Steemann 3871fb7af3 improved error messages 2013-08-20 11:48:08 +02:00
Jan Steemann 52b494e10f show dbname in error messages 2013-08-20 09:43:19 +02:00
Jan Steemann f2c840e8b0 allow compatibility with 1.4 only 2013-08-02 16:32:11 +02:00
Jan Steemann 9274bbef3e compatibility with 1.4 and higher 2013-08-02 16:31:24 +02:00
Jan Steemann 333017e59d don't complain if collection is not present 2013-08-02 15:32:35 +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 e86fff18e2 added chunkSize for replication-applier 2013-08-02 11:03:54 +02:00
Jan Steemann 11964f5720 display lastAvailableTick, fix cont. replication 2013-07-31 17:53:16 +02:00
Jan Steemann 6503cbda6b fixed invalid URL call 2013-07-31 16:47:54 +02:00
Jan Steemann 713db4daba changed wording 2013-07-31 15:00:23 +02:00
Jan Steemann 05a7f79941 re-configuration of logger, cap constraint 2013-07-31 14:39:33 +02:00