Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel

Browse Source

...

This commit is contained in:

Max Neunhoeffer 2016-01-11 10:54:06 +01:00

parent 9eb056b971 625cc51732

commit c801a8e763

147 changed files with 5 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0

Documentation/DocuBlocks/API_EDGE_CREATE.md → Documentation/DocuBlocks/Rest/API_EDGE_CREATE.md

Unescape Escape View File

0

Documentation/DocuBlocks/API_EDGE_DELETE.md → Documentation/DocuBlocks/Rest/API_EDGE_DELETE.md

Unescape Escape View File

0

Documentation/DocuBlocks/API_EDGE_READ.md → Documentation/DocuBlocks/Rest/API_EDGE_READ.md

Unescape Escape View File

0

Documentation/DocuBlocks/API_EDGE_READINOUTBOUND.md → Documentation/DocuBlocks/Rest/API_EDGE_READINOUTBOUND.md

Unescape Escape View File

0

Documentation/DocuBlocks/API_EDGE_READ_ALL.md → Documentation/DocuBlocks/Rest/API_EDGE_READ_ALL.md

Unescape Escape View File

0

Documentation/DocuBlocks/API_EDGE_READ_HEAD.md → Documentation/DocuBlocks/Rest/API_EDGE_READ_HEAD.md

Unescape Escape View File

0

Documentation/DocuBlocks/API_EDGE_REPLACE.md → Documentation/DocuBlocks/Rest/API_EDGE_REPLACE.md

Unescape Escape View File

0

Documentation/DocuBlocks/API_EDGE_UPDATES.md → Documentation/DocuBlocks/Rest/API_EDGE_UPDATES.md

Unescape Escape View File

0

Documentation/DocuBlocks/DeleteApiQueryCache.md → Documentation/DocuBlocks/Rest/DeleteApiQueryCache.md

Unescape Escape View File

0

Documentation/DocuBlocks/DeleteApiQueryKill.md → Documentation/DocuBlocks/Rest/DeleteApiQueryKill.md

Unescape Escape View File

0

Documentation/DocuBlocks/DeleteApiQuerySlow.md → Documentation/DocuBlocks/Rest/DeleteApiQuerySlow.md

Unescape Escape View File

0

Documentation/DocuBlocks/GetApiQueryCacheProperties.md → Documentation/DocuBlocks/Rest/GetApiQueryCacheProperties.md

Unescape Escape View File

0

Documentation/DocuBlocks/GetApiQueryCurrent.md → Documentation/DocuBlocks/Rest/GetApiQueryCurrent.md

Unescape Escape View File

0

Documentation/DocuBlocks/GetApiQueryProperties.md → Documentation/DocuBlocks/Rest/GetApiQueryProperties.md

Unescape Escape View File

0

Documentation/DocuBlocks/GetApiQuerySlow.md → Documentation/DocuBlocks/Rest/GetApiQuerySlow.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSA_get_api_collection_checksum.md → Documentation/DocuBlocks/Rest/JSA_get_api_collection_checksum.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSA_get_api_collection_count.md → Documentation/DocuBlocks/Rest/JSA_get_api_collection_count.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSA_get_api_collection_figures.md → Documentation/DocuBlocks/Rest/JSA_get_api_collection_figures.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSA_get_api_collection_name.md → Documentation/DocuBlocks/Rest/JSA_get_api_collection_name.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSA_get_api_collection_properties.md → Documentation/DocuBlocks/Rest/JSA_get_api_collection_properties.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSA_get_api_collection_revision.md → Documentation/DocuBlocks/Rest/JSA_get_api_collection_revision.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSA_put_api_simple_all.md → Documentation/DocuBlocks/Rest/JSA_put_api_simple_all.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSA_put_api_simple_any.md → Documentation/DocuBlocks/Rest/JSA_put_api_simple_any.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSA_put_api_simple_by_example.md → Documentation/DocuBlocks/Rest/JSA_put_api_simple_by_example.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSA_put_api_simple_first.md → Documentation/DocuBlocks/Rest/JSA_put_api_simple_first.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSA_put_api_simple_first_example.md → Documentation/DocuBlocks/Rest/JSA_put_api_simple_first_example.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSA_put_api_simple_fulltext.md → Documentation/DocuBlocks/Rest/JSA_put_api_simple_fulltext.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSA_put_api_simple_last.md → Documentation/DocuBlocks/Rest/JSA_put_api_simple_last.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSA_put_api_simple_near.md → Documentation/DocuBlocks/Rest/JSA_put_api_simple_near.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSA_put_api_simple_range.md → Documentation/DocuBlocks/Rest/JSA_put_api_simple_range.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSA_put_api_simple_remove_by_example.md → Documentation/DocuBlocks/Rest/JSA_put_api_simple_remove_by_example.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSA_put_api_simple_replace_by_example.md → Documentation/DocuBlocks/Rest/JSA_put_api_simple_replace_by_example.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSA_put_api_simple_update_by_example.md → Documentation/DocuBlocks/Rest/JSA_put_api_simple_update_by_example.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSA_put_api_simple_within.md → Documentation/DocuBlocks/Rest/JSA_put_api_simple_within.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSA_put_api_simple_within_rectangle.md → Documentation/DocuBlocks/Rest/JSA_put_api_simple_within_rectangle.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_HTTP_API_TRAVERSAL.md → Documentation/DocuBlocks/Rest/JSF_HTTP_API_TRAVERSAL.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_api_user_create.md → Documentation/DocuBlocks/Rest/JSF_api_user_create.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_api_user_delete.md → Documentation/DocuBlocks/Rest/JSF_api_user_delete.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_api_user_fetch.md → Documentation/DocuBlocks/Rest/JSF_api_user_fetch.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_api_user_fetch_list.md → Documentation/DocuBlocks/Rest/JSF_api_user_fetch_list.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_api_user_replace.md → Documentation/DocuBlocks/Rest/JSF_api_user_replace.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_api_user_update.md → Documentation/DocuBlocks/Rest/JSF_api_user_update.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_batch_processing.md → Documentation/DocuBlocks/Rest/JSF_batch_processing.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_cluster_check_port_GET.md → Documentation/DocuBlocks/Rest/JSF_cluster_check_port_GET.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_cluster_dispatcher_POST.md → Documentation/DocuBlocks/Rest/JSF_cluster_dispatcher_POST.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_cluster_planner_POST.md → Documentation/DocuBlocks/Rest/JSF_cluster_planner_POST.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_cluster_statistics_GET.md → Documentation/DocuBlocks/Rest/JSF_cluster_statistics_GET.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_cluster_test_DELETE.md → Documentation/DocuBlocks/Rest/JSF_cluster_test_DELETE.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_cluster_test_GET.md → Documentation/DocuBlocks/Rest/JSF_cluster_test_GET.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_cluster_test_HEAD.md → Documentation/DocuBlocks/Rest/JSF_cluster_test_HEAD.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_cluster_test_PATCH.md → Documentation/DocuBlocks/Rest/JSF_cluster_test_PATCH.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_cluster_test_POST.md → Documentation/DocuBlocks/Rest/JSF_cluster_test_POST.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_cluster_test_PUT.md → Documentation/DocuBlocks/Rest/JSF_cluster_test_PUT.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_delete_api_aqlfunction.md → Documentation/DocuBlocks/Rest/JSF_delete_api_aqlfunction.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_delete_api_collection.md → Documentation/DocuBlocks/Rest/JSF_delete_api_collection.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_delete_api_tasks.md → Documentation/DocuBlocks/Rest/JSF_delete_api_tasks.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_delete_batch_replication.md → Documentation/DocuBlocks/Rest/JSF_delete_batch_replication.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_admin_database_version.md → Documentation/DocuBlocks/Rest/JSF_get_admin_database_version.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_admin_echo.md → Documentation/DocuBlocks/Rest/JSF_get_admin_echo.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_admin_long_echo.md → Documentation/DocuBlocks/Rest/JSF_get_admin_long_echo.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_admin_modules_flush.md → Documentation/DocuBlocks/Rest/JSF_get_admin_modules_flush.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_admin_routing_reloads.md → Documentation/DocuBlocks/Rest/JSF_get_admin_routing_reloads.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_admin_server_role.md → Documentation/DocuBlocks/Rest/JSF_get_admin_server_role.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_admin_sleep.md → Documentation/DocuBlocks/Rest/JSF_get_admin_sleep.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_admin_statistics.md → Documentation/DocuBlocks/Rest/JSF_get_admin_statistics.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_admin_statistics_description.md → Documentation/DocuBlocks/Rest/JSF_get_admin_statistics_description.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_admin_time.md → Documentation/DocuBlocks/Rest/JSF_get_admin_time.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_admin_wal_properties.md → Documentation/DocuBlocks/Rest/JSF_get_admin_wal_properties.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_admin_wal_transactions.md → Documentation/DocuBlocks/Rest/JSF_get_admin_wal_transactions.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_api_aqlfunction.md → Documentation/DocuBlocks/Rest/JSF_get_api_aqlfunction.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_api_collections.md → Documentation/DocuBlocks/Rest/JSF_get_api_collections.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_api_database_current.md → Documentation/DocuBlocks/Rest/JSF_get_api_database_current.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_api_database_delete.md → Documentation/DocuBlocks/Rest/JSF_get_api_database_delete.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_api_database_list.md → Documentation/DocuBlocks/Rest/JSF_get_api_database_list.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_api_database_new.md → Documentation/DocuBlocks/Rest/JSF_get_api_database_new.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_api_database_user.md → Documentation/DocuBlocks/Rest/JSF_get_api_database_user.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_api_endpoint.md → Documentation/DocuBlocks/Rest/JSF_get_api_endpoint.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_api_index.md → Documentation/DocuBlocks/Rest/JSF_get_api_index.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_api_initiate.md → Documentation/DocuBlocks/Rest/JSF_get_api_initiate.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_api_reads_index.md → Documentation/DocuBlocks/Rest/JSF_get_api_reads_index.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_api_replication_applier_state.md → Documentation/DocuBlocks/Rest/JSF_get_api_replication_applier_state.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_api_replication_cluster_inventory.md → Documentation/DocuBlocks/Rest/JSF_get_api_replication_cluster_inventory.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_api_replication_dump.md → Documentation/DocuBlocks/Rest/JSF_get_api_replication_dump.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_api_replication_logger_first_tick.md → Documentation/DocuBlocks/Rest/JSF_get_api_replication_logger_first_tick.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_api_replication_logger_return_state.md → Documentation/DocuBlocks/Rest/JSF_get_api_replication_logger_return_state.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_api_replication_logger_returns.md → Documentation/DocuBlocks/Rest/JSF_get_api_replication_logger_returns.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_api_replication_logger_tick_ranges.md → Documentation/DocuBlocks/Rest/JSF_get_api_replication_logger_tick_ranges.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_api_return.md → Documentation/DocuBlocks/Rest/JSF_get_api_return.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_api_tasks.md → Documentation/DocuBlocks/Rest/JSF_get_api_tasks.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_get_api_tasks_all.md → Documentation/DocuBlocks/Rest/JSF_get_api_tasks_all.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_import_document.md → Documentation/DocuBlocks/Rest/JSF_import_document.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_import_json.md → Documentation/DocuBlocks/Rest/JSF_import_json.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_job_cancel.md → Documentation/DocuBlocks/Rest/JSF_job_cancel.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_job_delete.md → Documentation/DocuBlocks/Rest/JSF_job_delete.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_job_fetch_result.md → Documentation/DocuBlocks/Rest/JSF_job_fetch_result.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_job_getByType.md → Documentation/DocuBlocks/Rest/JSF_job_getByType.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_job_getStatusById.md → Documentation/DocuBlocks/Rest/JSF_job_getStatusById.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_post_admin_execute.md → Documentation/DocuBlocks/Rest/JSF_post_admin_execute.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_post_admin_test.md → Documentation/DocuBlocks/Rest/JSF_post_admin_test.md

Unescape Escape View File

0

Documentation/DocuBlocks/JSF_post_api_aqlfunction.md → Documentation/DocuBlocks/Rest/JSF_post_api_aqlfunction.md

Unescape Escape View File

Some files were not shown because too many files have changed in this diff Show More