Various fixes.

This commit is contained in:
Julien Fontanet 2015-05-06 15:33:09 +02:00
parent 8503350bfd
commit 33334830cc
2 changed files with 6 additions and 3 deletions

View File

@ -53,7 +53,6 @@
"lodash.filter": "^3.1.0",
"lodash.find": "^3.0.0",
"lodash.findindex": "^3.0.0",
"lodash.findlast": "^3.2.0",
"lodash.foreach": "^3.0.1",
"lodash.has": "^3.0.0",
"lodash.includes": "^3.1.1",
@ -64,6 +63,7 @@
"lodash.isstring": "^3.0.0",
"lodash.keys": "^3.0.4",
"lodash.map": "^3.0.0",
"lodash.omit": "^3.1.0",
"lodash.pick": "^3.0.0",
"lodash.pluck": "^3.0.2",
"lodash.result": "^3.0.0",

View File

@ -5,17 +5,20 @@ import isEmpty from 'lodash.isempty'
import isString from 'lodash.isstring'
import pluck from 'lodash.pluck'
import proxyRequest from 'proxy-http-request'
// import XoCollection from 'xo-collection'
// import XoView from 'xo-collection/view'
import {createClient as createRedisClient} from 'then-redis'
import {EventEmitter} from 'events'
import {parse as parseUrl} from 'url'
import Connection from './connection'
import spec from './spec'
import Xapi from './xapi'
import User, {Users} from './models/user'
import Xapi from './xapi'
import {$MappedCollection as MappedCollection} from './MappedCollection'
import {Acls} from './models/acl'
import {generateToken} from './utils'
import {NoSuchObject} from './api-errors'
import {Servers} from './models/server'
import {Tokens} from './models/token'
@ -57,7 +60,7 @@ export default class Xo extends EventEmitter {
constructor () {
super()
this._objects = new XoCollection()
// this._objects = new XoCollection()
// These will be initialized in start()
//