Frank Celler
|
b888e8cfa6
|
Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding
Conflicts:
arangod/V8Server/V8PeriodicJob.cpp
js/apps/system/aardvark/api-docs.json
js/apps/system/aardvark/api-docs/batch.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/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
|
2014-02-28 20:37:05 +01:00 |
Esteban Lombeyda
|
85e824f1c8
|
Bug Fix: compiler error
: searching strategy for installation directory upgraded
|
2014-02-28 12:07:29 +01:00 |
Frank Celler
|
42fb8244e1
|
added requeue
|
2014-02-25 12:07:16 +01:00 |
Max Neunhoeffer
|
267ee74d9a
|
Fix a namespace problem with a new file.
|
2014-02-21 16:11:00 +01:00 |
Frank Celler
|
5a7880b037
|
added no request
|
2014-02-20 21:09:13 +01:00 |
Frank Celler
|
b427bad63a
|
do not allow reset
|
2014-02-20 20:51:00 +01:00 |
Frank Celler
|
730da7623a
|
added periodic tasks and statistics historian
|
2014-02-20 20:29:55 +01:00 |