From d63f7fb248182e958a5e32003dfaddc5d3c3ab7f Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@c9.io>
Date: Fri, 24 Apr 2015 15:43:51 +0000
Subject: [PATCH 1/4] Revert "Allow using --domain to specify a custom
 top-level domain"

This reverts commit 6044a0c4b07c366a9ae5216542adf5caad5dc68b.
---
 server.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/server.js b/server.js
index 311897ce..9853e568 100755
--- a/server.js
+++ b/server.js
@@ -54,7 +54,6 @@ function main(argv, config, callback) {
         .default("settings", DEFAULT_SETTINGS)
         .describe("settings", "Settings file to use")
         .describe("dump", "dump config file as JSON")
-        .describe("domain", "Top-level domain to use (e.g, c9.io)")
         .boolean("help")
         .describe("help", "Show command line options.");
 
@@ -87,14 +86,6 @@ function start(configName, options, callback) {
    
     var settings = require(path.join(__dirname, "./settings", settingsName))();
     
-    if (argv.domain) {
-        settings.c9.domain = argv.domain;
-        for (var s in settings) {
-            settings[s].baseUrl = settings[s].baseUrl
-                && settings[s].baseUrl.replace(/[^./]+\.[^.]+$/, argv.domain);
-        }
-    }
-
     var plugins = require(configPath)(settings, options);
     
     if (argv.help) {

From d7981d21648ff060b08255bf812092af6973e48b Mon Sep 17 00:00:00 2001
From: Lennart kats <lennart@c9.io>
Date: Fri, 24 Apr 2015 15:47:27 +0000
Subject: [PATCH 2/4] Revert "Revert "Allow using --domain to specify a custom
 top-level domain""

This reverts commit d63f7fb248182e958a5e32003dfaddc5d3c3ab7f.
---
 server.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/server.js b/server.js
index 9853e568..311897ce 100755
--- a/server.js
+++ b/server.js
@@ -54,6 +54,7 @@ function main(argv, config, callback) {
         .default("settings", DEFAULT_SETTINGS)
         .describe("settings", "Settings file to use")
         .describe("dump", "dump config file as JSON")
+        .describe("domain", "Top-level domain to use (e.g, c9.io)")
         .boolean("help")
         .describe("help", "Show command line options.");
 
@@ -86,6 +87,14 @@ function start(configName, options, callback) {
    
     var settings = require(path.join(__dirname, "./settings", settingsName))();
     
+    if (argv.domain) {
+        settings.c9.domain = argv.domain;
+        for (var s in settings) {
+            settings[s].baseUrl = settings[s].baseUrl
+                && settings[s].baseUrl.replace(/[^./]+\.[^.]+$/, argv.domain);
+        }
+    }
+
     var plugins = require(configPath)(settings, options);
     
     if (argv.help) {

From 004d61fdb5c627a77e204d830cfb9199ee05acc3 Mon Sep 17 00:00:00 2001
From: Lennart kats <lennart@c9.io>
Date: Fri, 24 Apr 2015 16:05:49 +0000
Subject: [PATCH 3/4] Add new experiment.configure() powers


From 983dc030e0e8c5e50c9fe8e4c90984216e9dbb2f Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Tue, 28 Apr 2015 12:09:45 +0200
Subject: [PATCH 4/4] Fix test

---
 plugins/c9.vfs.standalone/www/test.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/c9.vfs.standalone/www/test.js b/plugins/c9.vfs.standalone/www/test.js
index ae30803d..cce8b53b 100644
--- a/plugins/c9.vfs.standalone/www/test.js
+++ b/plugins/c9.vfs.standalone/www/test.js
@@ -155,6 +155,9 @@ require([
                 prefs.add = function(){};
                 return prefs;
             })(),
+            analytics: {
+                addTrait: function() {}
+            },
             commands: (function(){
                 var commands = {};