Fixup the merge

This commit is contained in:
Johannes Zellner
2016-02-10 12:28:57 +01:00
parent 1cdb64e78d
commit 1b7265f866
7 changed files with 32 additions and 22 deletions

View File

@@ -56,7 +56,7 @@ function setup(done) {
function addApp(callback) {
var manifest = { version: '0.0.1', manifestVersion: 1, dockerImage: 'foo', healthCheckPath: '/', httpPort: 3, title: 'ok' };
appdb.add('appid', 'appStoreId', manifest, 'location', [ ] /* portBindings */, null /* accessRestriction */, false /* oauthProxy */, callback);
appdb.add('appid', 'appStoreId', manifest, 'location', [ ] /* portBindings */, null /* accessRestriction */, false /* oauthProxy */, 0 /* memoryLimit */, callback);
}
], done);
}