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/triAGENS/ArangoDB into devel

This commit is contained in:
Max Neunhoeffer 2014-12-01 18:52:01 +01:00
parent cfb0b21f2d a5bc624c13
commit f348dc8bac
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -1,6 +1,8 @@
v2.4.0 (XXXX-XX-XX)
-------------------
* fixed issue #1134: Change the default endpoint to localhost
* fixed non-working subquery index optimizations
* do not restrict summary of Foxx applications to 60 characters

2
etc/arangodb/arangod.conf.in
View File

@ -26,7 +26,7 @@ directory = @LOCALSTATEDIR@/lib/arangodb
# endpoint = tcp://[::]:8529
# endpoint = tcp://[fe80::21a:5df1:aede:98cf]:8529
#
endpoint = tcp://0.0.0.0:8529
endpoint = tcp://127.0.0.1:8529
# resuse a port on restart or wait until it is freed by the operating system
# reuse-address = false

9
js/server/upgrade-database.js
View File

@ -51,6 +51,7 @@ function updateGlobals() {
var userManager = require("org/arangodb/users");
var clusterManager = require("org/arangodb/cluster");
var currentVersion = require("org/arangodb/database-version").CURRENT_VERSION;
var sprintf = internal.sprintf;
var db = internal.db;
function upgrade () {
@ -758,12 +759,12 @@ function updateGlobals() {
var results = users.all().toArray().map(function (oldDoc) {
if (!oldDoc.hasOwnProperty('userData')) {
if (typeof oldDoc.user !== 'string') {
logger.error("user with _key " + oldDoc._key + " has no username");
return false;
oldDoc.user = "user" + oldDoc._rev;
logger.error(sprintf("user with _key %s has no username, using %s instead", oldDoc._key, oldDoc.user));
}
if (typeof oldDoc.password !== 'string') {
logger.error("user with username " + oldDoc.user + " has no password");
return false;
logger.error(sprintf("user with username %s has no password", oldDoc.user));
oldDoc.password = "$1$e3bdbd05$53e9ff46e996096ced8fefeeecf956da550e0d7d357c8ecdde061994d4d52cee";
}
var newDoc = {
user: oldDoc.user,