Merge remote-tracking branch 'origin/master' into newclient-dockerlike-deploy

pull/85/head^2
Tim Robinson 2015-04-22 15:31:39 +00:00
commit 5992919bc5
1 zmienionych plików z 2 dodań i 0 usunięć

Wyświetl plik

@ -144,6 +144,7 @@ module.exports = function(config, optimist) {
"c9.vfs.client": true, "c9.vfs.client": true,
"c9.cli.bridge": true, "c9.cli.bridge": true,
"c9.nodeapi": true, "c9.nodeapi": true,
"c9.ide.experiment": true,
"saucelabs.preview": true "saucelabs.preview": true
} }
}, },
@ -174,6 +175,7 @@ module.exports = function(config, optimist) {
"./c9.vfs.server/filelist", "./c9.vfs.server/filelist",
"./c9.vfs.server/statics", "./c9.vfs.server/statics",
"./c9.metrics/mock_metrics", "./c9.metrics/mock_metrics",
"./c9.ide.experiment/mock_experiment",
{ {
packagePath: "./c9.vfs.server/vfs.connect.standalone", packagePath: "./c9.vfs.server/vfs.connect.standalone",
workspaceDir: baseProc, workspaceDir: baseProc,