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

605 Commits

Author SHA1 Message Date
Jan Steemann 72a102e794 major internal changes 2014-06-08 00:12:53 +02:00
Jan Steemann ca959cab9d simplified usage of transactions 2014-06-06 23:28:34 +02:00
Jan Steemann 3f6cb4d9ed fixed update policy 2014-06-06 22:53:59 +02:00
Jan Steemann 368091d7c3 function cleanup 2014-06-06 21:35:34 +02:00
Max Neunhoeffer fd2c99443f Introduce TRI_doc_mptr_copy_t for copies of master pointers. 
Did not yet run through all occurrences of TRI_doc_mptr_t to see
whether they have to be TRI_doc_mptr_copy_t.
 2014-06-06 16:59:32 +02:00
Jan Steemann 362838ae69 TRI_ASSERT 2014-06-06 11:25:19 +02:00
Jan Steemann cb5bb4eb0e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/Makefile.files
	arangod/RestHandler/RestEdgeHandler.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/voc-shaper.cpp
 2014-06-05 22:58:49 +02:00
Jan Steemann 17981a92c2 more barriers 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-06-05 22:23:48 +02:00
Max Neunhoeffer 2776dc78fa Make TRI_doc_mptr_t a C++ struct. 2014-06-05 12:03:57 +02:00
Max Neunhoeffer a7792a5306 Looked through TRI_EXTRACT_MARKER_KEY for protection. 2014-06-04 15:40:09 +02:00
Max Neunhoeffer f3653015b6 First part of protection proof. 2014-06-04 14:31:38 +02:00
Max Neunhoeffer 13541cf4ec Rename component _data -> _dataptr in master pointer. 2014-06-03 22:27:08 +02:00
Jan Steemann fb87b35dec initial implementation of wal logfile collection, scans markers only atm 2014-06-03 16:39:49 +02:00
Jan Steemann 715d11cb22 removed consts 2014-06-03 10:17:09 +02:00
Jan Steemann d4dd58b264 merged primary-collection.cpp with document-collection.cpp 2014-05-31 00:22:32 +02:00
Jan Steemann 7b521a4c9e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/VocBase/document-collection.cpp
	arangod/VocBase/document-collection.h
 2014-05-30 12:51:20 +02:00
Jan Steemann ed6a55abb9 specialized primary index for faster comparisons and less datafile lookups 2014-05-29 03:35:37 +02:00
Max Neunhoeffer bb5b341ba6 Get rid of many "using namespace ..." occurrences in header files. 2014-05-22 15:13:16 +02:00
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
Max Neunhoeffer 2820afdcc2 Remove many extern "C" declarations that are no longer needed. 2014-05-22 10:19:03 +02:00
Max Neunhoeffer e7560357d2 Further cleanup with #include "Basics/Common.h" 2014-05-21 16:59:54 +02:00
Max Neunhoeffer 69353334eb Get rid of TRI_ENABLE_CLUSTER everywhere. 2014-05-21 14:46:47 +02:00
Max Neunhoeffer 0af211c1e5 More header cleanups. 2014-05-21 13:42:41 +02:00
Jan Steemann b811d21fad issue #862: added `--overwrite` option for arangoimp 2014-05-16 21:29:20 +02:00
scottashton 700480f20a adjusted all require(org/arangodb/graph) to new graph-blueprint module 2014-05-15 10:33:20 +02:00
Jan Steemann 14813638dd removed boost 2014-05-12 17:22:42 +02:00
Jan Steemann 204a16c224 fixed compiler warning 2014-05-12 13:55:58 +02:00
Frank Celler 16d5c6bfa2 windows does not like cast from double to enum 2014-05-10 17:36:21 +02:00
Max Neunhoeffer 2ee2700096 If a collection cannot be dropped during restore, truncate it. 2014-05-09 23:18:27 +02:00
Max Neunhoeffer c181e15906 Silence a compiler warning about signedness. 2014-05-09 22:59:34 +02:00
Max Neunhoeffer 7c8fc95de8 arangorestore/cluster: default to 1 shard. 
If shards is not given in the structure description, take 1 shard.
 2014-05-09 22:58:08 +02:00
Max Neunhoeffer 19289b6d37 First working version of arangorestore for clusters. 2014-05-09 16:33:54 +02:00
Jan Steemann 20f1940458 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-09 00:42:32 +02:00
Jan Steemann 2e17f4bcd7 cppcheck 2014-05-09 00:21:17 +02:00
Max Neunhoeffer 9b5f015747 Prepare setup for cluster arangorestore. 2014-05-08 22:38:52 +02:00
Max Neunhoeffer 8dc74b9958 Fix result structure of clusterInventory. 2014-05-08 10:22:01 +02:00
Max Neunhoeffer a312d496a9 Finish server functionality for cluster dump. 2014-05-07 16:36:47 +02:00
Max Neunhoeffer 272aa89904 More trampoline functionality in coordinator. 
inventory and dump (not yet working).
restore-data (not yet tested).
 2014-05-06 21:36:52 +02:00
Max Neunhoeffer 271e33be48 Implement trampoline for /_api/replication/batch. 2014-05-06 16:27:27 +02:00
Jan Steemann e968d62367 re-use planId 2014-03-05 15:33:49 +01:00
Esteban Lombeyda 39b0b759e9 bug fix: compiling error 2014-03-05 09:00:23 +01:00
Frank Celler 5a2fa4f37d stop if upgrade is needed 2014-03-01 16:14:29 +01:00
Jan Steemann 978e784462 disable replication handlers for coordinators 2014-02-28 21:51:02 +01:00
Jan Steemann 629348d696 properly acquire shape write locks 2014-02-28 18:43:09 +01:00
Jan Steemann 897d6f4dcd fixed cluster authentication 2014-02-27 17:45:03 +01:00
Jan Steemann a0c554fa22 fixed tests 2014-02-27 14:58:01 +01:00
Jan Steemann a0c32e90d7 fixed edge access in coordinator 2014-02-27 13:14:02 +01:00
Jan Steemann 42465ce876 properly return collection status 2014-02-26 14:23:06 +01:00
Frank Celler 3c5f3a656b Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-25 15:32:12 +01:00
Frank Celler f2121ff442 cleanup 2014-02-25 15:32:07 +01:00
Jan Steemann 00cd7cd936 fix error message for udf document keys 2014-02-25 14:23:59 +01:00
Frank Celler 42fb8244e1 added requeue 2014-02-25 12:07:16 +01:00
Jan Steemann 7a0aac82e2 re-create database objects on coordinator now, and switch into them 2014-02-21 17:40:00 +01:00
Jan Steemann 4ee05d303c invalidate caches 2014-02-06 14:14:52 +01:00
Jan Steemann c38c038492 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsItemView.css
	js/apps/system/aardvark/frontend/css/graphlayout.css
 2014-02-06 13:18:52 +01:00
Jan Steemann b5550e17a6 updated tests and documentation 2014-02-06 12:11:17 +01:00
Jan Steemann 10eb807366 fixed HTTP CRUD operations 2014-02-05 17:19:45 +01:00
Jan Steemann 58b3e0f99d splitted a few tests 2014-02-05 15:15:51 +01:00
Jan Steemann e7d7f3e00a updated documentation 2014-02-04 12:41:52 +01:00
Jan Steemann 599a7edfda return document etag in response to HTTP HEAD requests that return an HTTP 412 error 2014-02-04 12:01:28 +01:00
Jan Steemann 67a3f306d6 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-03 18:25:13 +01:00
Jan Steemann 18b38771dc added cluster CRUD tests 2014-02-03 18:24:57 +01:00
Jan Steemann fbf6954bd7 updated documentation 2014-02-01 00:26:02 +01:00
Max Neunhoeffer 73f3dbc328 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-31 18:56:47 +01:00
Jan Steemann 04d40c10e9 fixed wrong REST API parameter type in documentation 2014-01-31 13:56:24 +01:00
Jan Steemann 9a7781474f fixed broken symbol 2014-01-31 13:20:39 +01:00
Jan Steemann 9643469631 do not allow changing shard key attributes 2014-01-31 13:19:03 +01:00
Max Neunhoeffer f92456b851 Report URLs of edges correctly. 2014-01-31 11:02:51 +01:00
Max Neunhoeffer 4d3b747182 Add getAllDocumentsOnCoordinator and fix bugs. 2014-01-31 01:02:51 +01:00
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
Max Neunhoeffer 3a5a085bc5 Sort out mess with collection name/id lookup in cluster. 2014-01-30 17:27:06 +01:00
Max Neunhoeffer ed39834029 CRUD basically working on cluster. 2014-01-29 16:23:17 +01:00
Max Neunhoeffer c3f01237b0 Implement replace and update on cluster. 
This still has a freeing too early bug with TRI_json_t.
 2014-01-28 16:49:44 +01:00
Jan Steemann 7f240a1625 fixed segfault in import API 2014-01-27 16:12:39 +01:00
Jan Steemann 945031cfb5 updated documentation 2014-01-27 12:15:56 +01:00
Max Neunhoeffer 98df540266 Add support for GET and HEAD on cluster. 2014-01-27 10:41:35 +01:00
Max Neunhoeffer 7d5723756f Implement DELETE REST method on the coordinator. 2014-01-24 21:31:58 +01:00
Max Neunhoeffer fe348a36ca Start support for create edge in coordinator in cluster. 2014-01-24 16:47:29 +01:00
Jan Steemann ea2af50683 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	Documentation/ImplementorManual/HttpSystem.md
	js/apps/system/aardvark/aardvark.js
	js/apps/system/aardvark/frontend/css/buttons.css
	js/server/version-check.js
 2014-01-24 14:50:09 +01:00
Max Neunhoeffer 4526181f82 Implement C of CRUD on cluster for V8 calls. 2014-01-24 13:11:20 +01:00
Max Neunhoeffer f5c274e8c0 Fix error handling and another bug in create document for cluster. 2014-01-24 10:35:37 +01:00
Max Neunhoeffer 9230f5020c First case of create document is working on cluster. 2014-01-23 16:16:06 +01:00
Max Neunhoeffer 165d98578a First hack at create document via REST on cluster. 2014-01-23 13:00:44 +01:00
Max Neunhoeffer 3887303a82 Prepare creation of a document in the coordinator. 2014-01-22 23:57:41 +01:00
Jan Steemann f5039a4f54 make usage of batch API easier 2014-01-21 17:56:49 +01:00
Jan Steemann 12dbcc535d updated import manual 2014-01-21 09:16:42 +01:00
Jan Steemann 30b866405e issue #732: Rest API GET revision number 2014-01-13 17:30:17 +01:00
Jan Steemann 7d11d1b172 updated documentation 2014-01-10 18:38:34 +01:00
Jan Steemann 0ae9a69c6a updated documentation 2014-01-10 18:38:25 +01:00
Jan Steemann fd334b14e1 fixed small typo in documentation 2014-01-10 16:45:20 +01:00
Jan Steemann e1dd2cb4db allow \n as line terminator in batch requests 2014-01-03 12:12:40 +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 865b70862e some minor adjustments for arangodump and arangorestore 2013-12-13 11:54:00 +01:00
Jan Steemann 1bdf666da2 fixed multi-threading issues found during commando 2013-11-21 15:12:49 +01:00
Jan Steemann c5e9538547 Merge remote-tracking branch 'origin/devel' into inline-shapes 
Conflicts:
	arangod/VocBase/document-collection.c
 2013-11-14 01:01:24 +01:00
Jan Steemann f69ae8f2a9 do not access shaper but use memory zone variable 2013-11-08 13:42:16 +01:00
Jan Steemann 96dc8e3879 free json in case of error 2013-11-05 12:42:50 +01:00
Jan Steemann 4f50b98c45 removed second logger implementation 2013-10-30 00:38:25 +01:00
Jan Steemann 02736666b1 fixed small memleak 2013-10-29 11:10:13 +01:00
Jan Steemann 2e301f118d issue #648: /batch API is missing from Web Interface API Docummentation (Swagger) 2013-10-29 04:43:34 +01:00
Jan Steemann 43b4f78b62 issue #620 2013-10-28 19:38:19 +01:00
Jan Steemann 54c7386d6c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-10-17 11:12:10 +02:00
Jan Steemann d71ee7ff6f fixed issue #615 2013-10-17 11:12:02 +02:00
Jan Steemann 21d25d0ccc removed resourceholder 2013-10-17 10:43:07 +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 6a353a4c38 resolve collection names on reimport 2013-10-10 12:33:27 +02:00
Jan Steemann 13b51eb849 use batches in arangodump 2013-10-10 09:08:02 +02:00
Jan Steemann af07091d1c Windows fixes 2013-10-09 15:33:38 +02:00
Jan Steemann fbcb7ecb17 fix temp file creation on Windows 2013-10-09 13:58:01 +02:00
Jan Steemann 0c15f387ae added collection id translation for dumps 2013-10-09 13:46:12 +02:00
Jan Steemann 406a1b7d4c fix filename 2013-10-09 11:24:05 +02:00
Jan Steemann 857c69d5a6 added `--server.allow-method-override` startup option 2013-10-08 17:06:42 +02:00
Jan Steemann 63f6cb91f4 added `details` URL parameter for `/_api/import` 2013-10-08 01:34:16 +02:00
Jan Steemann d6149c9a9a added documentation for /_api/import 2013-10-02 14:22:25 +02:00
Jan Steemann e5bde25f3b make source database name configurable for replication applier 2013-10-01 17:36:30 +02:00
Jan Steemann 04df715864 applied fixes that occurred during build 2013-09-30 18:03:52 +02:00
Jan Steemann 709198c340 updated docs for /_api/jobs 2013-09-28 00:44:03 +02:00
Jan Steemann 106fedd615 several errors fixed 2013-09-26 09:44:50 +02:00
Jan Steemann ed163164c4 fixed queue naming 2013-09-20 13:17:32 +02:00
Jan Steemann 0bdae05b96 changed reference counting for cursors 2013-09-16 13:51:33 +02:00
Jan Steemann a120a4dbe6 reverted name change for _graphs collection 2013-09-12 18:15:34 +02:00
Jan Steemann 3a6cabfe44 creating/dropping 2013-09-11 17:16:43 +02:00
Jan Steemann c22fd49d84 small cleanup 2013-09-11 14:21:54 +02:00
Jan Steemann 1c4581c525 fixed batch handler 2013-09-11 13:58:39 +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
Jan Steemann c6c4c70333 activated arangodump and arangorestore 2013-09-06 00:54:58 +02:00
Jan Steemann ca2f5feb4b fixed redirect URLs 2013-09-04 17:30:37 +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 a42be561fd added includeSystem URL parameter 2013-08-29 21:15:47 +02:00
Jan Steemann e72c6ab20c fixed a memleak in /_api/replication/dump 2013-08-29 11:46:33 +02:00
Jan Steemann 7cb6b7d922 simplified build.h stuff 2013-08-28 19:57:07 +02:00
Jan Steemann b94ee1042c cppcheck 2013-08-27 16:13:44 +02:00
Frank Celler 487af3bc0d fixed (hacked) display of swagger for dev apps 2013-08-07 13:30:28 +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 9b6b6e669d added `totalEvents` for logger 2013-08-02 10:11:13 +02:00
Jan Steemann 8fb5f6bc32 lol swagger 2013-08-01 19:03:18 +02:00
Jan Steemann df7a0af4ce swag... 2013-08-01 18:46:06 +02:00
Jan Steemann 38d8b0b598 adjusted tests and docs 2013-08-01 18:41:13 +02:00
Jan Steemann a7c5350455 added server-id method 2013-08-01 18:27:42 +02:00
Jan Steemann 11eece3f6f decreased memory usage 2013-08-01 17:02:31 +02:00
Jan Steemann f1418ec667 updated tests and docs 2013-08-01 16:53:29 +02:00
Jan Steemann 949c194653 updated replication configuration 2013-08-01 15:50:30 +02:00
Jan Steemann 11964f5720 display lastAvailableTick, fix cont. replication 2013-07-31 17:53:16 +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 2368adf250 updated documentation 2013-07-31 10:10:34 +02:00
Jan Steemann 936fb6c6a6 better progress reports for replication applier 2013-07-31 10:01:56 +02:00
Jan Steemann 78601319fb updated replication API 2013-07-30 18:40:35 +02:00
Jan Steemann 461001efd2 split of initial and continuous sync, currently not working 2013-07-30 14:13:49 +02:00
Jan Steemann 002ebd48bc removed all replication conditionals 2013-07-30 13:16:37 +02:00
Jan Steemann 6b5900e8e0 updated replication api 2013-07-30 09:54:39 +02:00
Jan Steemann 226667bea1 fixed doxygen generation 2013-07-29 13:38:00 +02:00
Jan Steemann 3b57e80241 simplified HTTP import API 2013-07-25 18:24:21 +02:00
Jan Steemann 9de2910717 updated replication documentation 2013-07-25 16:32:11 +02:00
Jan Steemann 051e898a8a updated replication documentation 2013-07-25 14:13:53 +02:00
Jan Steemann 8a254ea230 replication API documentation 2013-07-24 17:37:16 +02:00
Jan Steemann 39195af4c5 easier generation of swagger API docs 2013-07-24 15:24:27 +02:00
Jan Steemann 4f14062d10 replication tests 2013-07-24 15:22:45 +02:00
Jan Steemann 0adbe8410f log "rev" 2013-07-23 18:00:29 +02:00
Jan Steemann 47c8b7bfc8 fixed leaks 2013-07-23 15:37:12 +02:00
Jan Steemann 5fe1844ee1 replication tests 2013-07-23 15:03:59 +02:00
Jan Steemann f49ae77bc5 include replication tests 2013-07-23 11:19:41 +02:00
Jan Steemann 539954894f log last access time of clients 2013-07-22 18:13:21 +02:00
Jan Steemann c4f82088dd replication tests 2013-07-22 18:12:56 +02:00
Jan Steemann 08b9f57166 stoppable replication applier 2013-07-17 10:58:10 +02:00
Jan Steemann dcd8b63db3 added configuration 2013-07-12 15:40:18 +02:00
Jan Steemann 0266e2339a replication apply state tracking 2013-07-12 15:06:52 +02:00
Jan Steemann 1f564ef6ae linkage between C and C++ 2013-07-11 17:50:48 +02:00
Jan Steemann 98dd1c2522 moved replication parts into separate files 2013-07-11 14:44:09 +02:00
Jan Steemann ca6b184286 added TRI_JSON_STRING_REFERENCE 2013-07-10 17:00:29 +02:00
Jan Steemann 7ef7ad297f added TRI_StealStringBuffer() 2013-07-10 12:02:42 +02:00
Jan Steemann a7c1ee0191 less lock 2013-07-09 13:36:38 +02:00
Jan Steemann 9fa91447ce renamed attributes 2013-07-09 12:58:10 +02:00
Jan Steemann ca94bf3f39 replication 2013-07-09 11:15:58 +02:00
Jan Steemann 48d851bb7b log dump 2013-07-08 16:33:47 +02:00
Jan Steemann dfd9117fd1 some cleanup, initial implementation of log dump 2013-07-08 12:27:20 +02:00
Jan Steemann d79d95a3a7 moved attribute names to defines 2013-07-05 14:41:23 +02:00
Jan Steemann ebb121b44a sync all collection markers 2013-07-05 13:59:48 +02:00
Jan Steemann 054ed3ca3f apply collection data dumps 2013-07-05 11:41:37 +02:00
Jan Steemann 10327f0870 initial code for collection data dump 2013-07-04 16:55:46 +02:00
Jan Steemann a0c1308edb initial synching of collections 2013-07-04 15:53:51 +02:00
Jan Steemann f5968a4646 handle a master's state response 2013-07-04 10:13:09 +02:00
Jan Steemann 7967936f67 added server id to output 2013-07-03 15:42:34 +02:00
Jan Steemann 7a7d833b18 intermediate commit 2013-06-28 19:04:08 +02:00
Jan Steemann d89262dc6a incremental collection dump 2013-06-28 12:07:13 +02:00
Jan Steemann 4b758eb0e8 moved functions 2013-06-28 10:25:45 +02:00
Jan Steemann cf10b0e8ff added missing ifdefs 2013-06-27 19:28:53 +02:00
Jan Steemann b643ff4b43 added dump command 2013-06-27 19:26:10 +02:00
Jan Steemann 1cb3296e70 implemented start/stop HTTP methods for replication 2013-06-27 16:10:01 +02:00
Jan Steemann 0de3bd4213 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-06-26 12:05:11 +02:00
Jan Steemann 6e9c3e8e2c replication logging 2013-06-26 12:04:55 +02:00
Jan Steemann 81b94bff94 added missing error handling for importing edges 2013-06-25 16:22:10 +02:00
Jan Steemann 2ef2f60cc4 removed unused section 2013-06-19 14:04:24 +02:00
a-brandt 9e0335a1bf Merge branch 'devel' into multiple_databases 2013-06-06 16:12:44 +02:00
Thomas Richter dc691ca6c2 examples generated in api-simple.js 2013-06-06 14:43:36 +02:00
a-brandt 384b3c283c Merge branch 'devel' into multiple_databases 2013-06-04 13:07:06 +02:00
Jan Steemann c259f8ff4a fixed typo 2013-06-04 10:29:01 +02:00
a-brandt aeec284400 Merge branch 'devel' into multiple_databases 2013-06-03 17:09:21 +02:00
a-brandt 1c0578c2b5 Merge branch 'devel' into multiple_databases 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/vocbase.c
	lib/HttpServer/ApplicationEndpointServer.cpp
	lib/HttpServer/ApplicationEndpointServer.h
	lib/HttpServer/HttpCommTask.h
	lib/HttpServer/HttpHandlerFactory.cpp
	lib/HttpServer/HttpHandlerFactory.h
	lib/Rest/HttpRequest.cpp
	lib/Rest/HttpRequest.h
 2013-06-03 17:05:01 +02:00
Thomas Richter c230a87879 minor changes 2013-05-31 16:40:24 +02:00
Thomas Richter 33563c3d37 names changed in Examples 2013-05-31 10:08:39 +02:00
Jan Steemann d7b64d4ae2 merged patches by @guidoreina 2013-05-21 11:33:43 +02:00
Jan Steemann ac8e947fb6 typo 2013-05-16 20:53:04 +02:00
Thomas Richter b09be801b9 swagger for RestDocumentHandler finished 2013-05-16 14:59:51 +02:00
Thomas Richter a11a0633b8 examples created until document PUT 2013-05-15 16:07:05 +02:00
Jan Steemann 0d05d53670 switched examples back to English 2013-05-13 21:20:51 +02:00
Thomas Richter dbdd9b2b80 some REST documentation adapted for swagger 2013-05-13 16:30:23 +02:00
Jan Steemann 7f5884626c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-05-13 09:01:29 +02:00
Jan Steemann c7d2f8f8cd some json / shaped-json and string handling improvements 2013-05-13 09:01:07 +02:00
Jan Steemann 841d7d7355 English 2013-05-10 14:06:15 +02:00
Jan Steemann 5b94d9af98 less malloc/free for JSON parsing 2013-05-08 23:32:14 +02:00
Thomas Richter 0562e5c94d Header with 304 returncode fixed 2013-05-08 15:38:12 +02:00
Jan Steemann bfb35a4b3c issue #495 2013-05-03 11:38:10 +02:00
Jan Steemann fde26e6913 fixed doxygen errors 2013-05-03 11:25:24 +02:00
Jan Steemann ee7ab712d6 issue #495 2013-05-03 11:08:58 +02:00
Thomas Richter 85a5f05c93 swagger documentation for api-grap.js 2013-04-30 14:52:35 +02:00
Thomas Richter 1d232d6967 some fixes in generateSwagger 2013-04-30 11:40:19 +02:00
a-brandt 6839fe7701 Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases 2013-04-24 17:46:36 +02:00
Thomas Richter cb940c85bd added some query and header parameters to the swagger tags 2013-04-24 15:28:31 +02:00
Thomas Richter 2fdada8724 backtick problem in REST-URL fixed 2013-04-23 12:25:16 +02:00
a-brandt 234b1460f8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases 2013-04-23 09:55:08 +02:00
Thomas Richter 62b870e725 in REST-documentation @LIT{} and @FA{} replaced by backticks 2013-04-22 15:42:59 +02:00
Thomas Richter 874b855fe8 in REST-documentation @LIT{} and @FA{} replaced by backticks 2013-04-22 15:39:43 +02:00
a-brandt 58de325e98 Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases 2013-04-17 16:58:23 +02:00
a-brandt fcae2b2961 added RequestContext 2013-04-17 16:56:48 +02:00
Jan Steemann 30b2b2ef3e adjusted locks 2013-04-16 11:23:21 +02:00
Jan Steemann 8e4af7a952 fixed some locking 2013-04-15 12:43:53 +02:00
Frank Celler 828b939053 fixed isolates, made ArangoError internal 2013-04-10 21:22:09 +02:00
Frank Celler f810711a79 FreeBSD port 2013-04-02 18:43:10 +02:00
Thomas Richter f876e30816 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-04-02 09:38:45 +02:00
Jan Steemann ba0d608a25 renamed function 2013-03-28 14:13:11 +01:00
Jan Steemann 6b3b181930 pass transaction collection into CRUD operations 2013-03-28 13:26:49 +01:00
Thomas Richter f77fa798c8 generateArangoshRun db._collections() error fixed 2013-03-27 14:37:28 +01:00
Jan Steemann 81d5c71cf3 fixed documentation 2013-03-26 10:08:26 +01:00
Thomas Richter 9a08a1d609 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
work in progress swagger
 2013-03-26 09:14:05 +01:00
Thomas Richter 48df7ab80a work in progress 2013-03-26 09:13:56 +01:00
Jan Steemann 0e6c21e4e7 removed NEW_BORN collection status in server 2013-03-25 15:51:42 +01:00
Jan Steemann 124d7cb29f fixed file uploads 2013-03-24 18:13:13 +01:00
Jan Steemann d9595caaf5 added upload API 2013-03-24 13:17:50 +01:00
Thomas Richter f14efc0278 swagger added 2013-03-22 12:21:55 +01:00
Jan Steemann ccc7c3665b locking 2013-03-22 11:31:36 +01:00
Jan Steemann 9b282ab74c some cleanup of transaction code 2013-03-21 18:54:38 +01:00
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01:00
Jan Steemann af2d966559 fixed a typo 2013-03-08 22:31:17 +01:00