NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'stable' into next-release

Browse Source
This commit is contained in:
Julien Fontanet 2016-02-26 10:23:51 +01:00
commit 3653e89714
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package.json
View File

@ -1,6 +1,6 @@
{
"name": "xo-server",
"version": "4.14.2",
"version": "4.14.3",
"license": "AGPL-3.0",
"description": "Server part of Xen-Orchestra",
"keywords": [
@ -160,8 +160,9 @@
"start": "node bin/xo-server",
"test": "mocha --opts .mocha.opts \"dist/**/*.spec.js\"",
"posttest": "npm run lint && dependency-check ./package.json",
"preversion": "git checkout next-release && git pull --ff-only && git checkout stable && git pull --ff-only && git merge next-release",
"postversion": "git checkout master && git merge --ff-only stable && git checkout next-release && git merge --ff-only stable"
"prerelease": "git checkout next-release && git pull --ff-only && git checkout stable && git pull --ff-only && git merge next-release",
"release": "npm version",
"postrelease": "git checkout master && git merge --ff-only stable && git checkout next-release && git merge --ff-only stable"
},
"standard": {
"ignore": [

2
src/remote-handlers/nfs.js
View File

@ -40,7 +40,7 @@ export default class NfsHandler extends LocalHandler {
async _mount (remote) {
await fs.ensureDir(remote.path)
return execa('mount', ['-t', 'nfs', `${remote.host}:${remote.share}`, remote.path])
return execa('mount', ['-t', 'nfs', '-o', 'vers=3', `${remote.host}:${remote.share}`, remote.path])
}
async _sync () {

8
src/xo-mixins/subjects.js
View File

@ -41,6 +41,8 @@ class NoSuchUser extends NoSuchObject {
export default class {
constructor (xo) {
this._xo = xo
const redis = xo._redis
this._groups = new Groups({
@ -83,10 +85,10 @@ export default class {
await this._users.remove(id)
// Remove tokens of user.
this._getAuthenticationTokensForUser(id)
this._xo._getAuthenticationTokensForUser(id)
.then(tokens => {
forEach(tokens, token => {
this._tokens.remove(token.id)
this._xo._tokens.remove(token.id)
.catch(noop)
})
})
@ -178,7 +180,7 @@ export default class {
return user
}
if (!this._config.createUserOnFirstSignin) {
if (!this._xo._config.createUserOnFirstSignin) {
throw new Error(`registering ${name} user is forbidden`)
}