Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Max Neunhoeffer 2016-05-02 10:46:38 +02:00
parent 9668a3eb87 043c1f1222
commit 62f4c78baa
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdParty/CMakeLists.txt vendored
View File

@ -26,7 +26,7 @@ option(USE_PRECOMPILED_V8 "use a precompiled V8" OFF)
if (USE_PRECOMPILED_V8) if (USE_PRECOMPILED_V8)
set(V8_VERSION set(V8_VERSION
"V8-4.9.391" "V8-5.0.71.39"
CACHE INTERNAL CACHE INTERNAL
"${PROJECT_NAME}: Version" "${PROJECT_NAME}: Version"
FORCE FORCE

4
js/apps/system/_admin/aardvark/APP/frontend/js/templates/queryView2.ejs
View File

@ -9,8 +9,8 @@
<button id="saveCurrentQuery" class="button-success"><i class="fa fa-save"></i>Save</button> <button id="saveCurrentQuery" class="button-success"><i class="fa fa-save"></i>Save</button>
</div> </div>
<div class="pull-right" style="position: absolute; top: 60px; right: 0;"> <div class="pull-right">
<span id="querySpotlight" class="action"><i class="fa fa-search"></i></span> <span id="querySpotlight" class="action"><i class="fa fa-magic"></i></span>
<div class="styled-select"> <div class="styled-select">
<select id="querySize" class="query-size"/> <select id="querySize" class="query-size"/>
</div> </div>

2
js/server/modules/@arangodb/foxx/sessions/storages/collection.js
View File

@ -36,7 +36,7 @@ module.exports = function collectionStorage(cfg) {
if (!cfg) { if (!cfg) {
cfg = {}; cfg = {};
} }
const autoUpdate = Boolean(cfg.autoUpdate); const autoUpdate = Boolean(cfg.autoUpdate !== false);
const pruneExpired = Boolean(cfg.pruneExpired); const pruneExpired = Boolean(cfg.pruneExpired);
const ttl = (cfg.ttl || 60 * 60) * 1000; const ttl = (cfg.ttl || 60 * 60) * 1000;
const collection = ( const collection = (