Merge branch 'master' into ja_redis_cluster

This commit is contained in:
James Allen 2016-06-09 10:00:58 +01:00
commit 9ff3026807
3 changed files with 1 additions and 3 deletions

View file

@ -39,4 +39,3 @@ module.exports = TrackChangesManager =
if error?
logger.error err: error, doc_id: doc_id, project_id: project_id, "error flushing doc to track changes api"
callback()

View file

@ -7,7 +7,7 @@
"url": "https://github.com/sharelatex/document-updater-sharelatex.git"
},
"dependencies": {
"async": "^2.0.0-rc.5",
"async": "2.0.0-rc.5",
"coffee-script": "1.4.0",
"express": "3.3.4",
"ioredis": "^2.0.1",

View file

@ -93,4 +93,3 @@ describe "TrackChangesManager", ->
)
.should.equal true