1
0
Fork 0

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

This commit is contained in:
Max Neunhoeffer 2015-06-10 15:52:16 +02:00
commit bc966c1848
3 changed files with 10 additions and 3 deletions

View File

@ -48,3 +48,11 @@ before_script: "bash -c Installation/travisCI/before_script.sh"
script:
- "bash -c Installation/travisCI/build.sh"
after_failure: "bash -c Installation/travisCI/after_failure.sh"
notifications:
webhooks:
urls:
- https://webhooks.gitter.im/e/806d92fa9ae97d241599
on_success: change
on_failure: always
on_start: false

View File

@ -108,7 +108,7 @@
* [Debugging](Foxx/Develop/Debugging.md)
* [Source Files](Foxx/Develop/Folder.md)
* [Controller](Foxx/Develop/Controller.md)
* [Setup & Teardown](Foxx/Develop/Scripts.md)
* [Scripts](Foxx/Develop/Scripts.md)
* [Repository](Foxx/Develop/Repository.md)
* [Model](Foxx/Develop/Model.md)
* [Queries](Foxx/Develop/Queries.md)

View File

@ -135,7 +135,6 @@ exports.manage = function () {
exports.run = function () {
var options = require('internal').options();
// disable foxx queues
if (options['server.foxx-queues'] === false) {
return;
@ -164,7 +163,7 @@ exports.run = function () {
db._useDatabase(initialDatabase);
return tasks.register({
command: function (params) {
command: function () {
require('org/arangodb/foxx/queues/manager').manage();
},
period: period,