Merge pull request Netflix#5 from trotter/patch-1

Fix whitespace in EdgeServer.java

Author: smadappa

build.gradle

@@ -48,7 +48,7 @@ subprojects {
         compile 'com.netflix.ribbon:ribbon-httpclient:0.1.2'
         compile 'com.netflix.governator:governator:1.0.3'
         compile 'com.netflix.karyon:karyon-core:1.0.2'
-	compile 'com.netflix.karyon:karyon-admin-web:1.0.2'
+        compile 'com.netflix.karyon:karyon-admin-web:1.0.2'
         testCompile 'junit:junit:4.10'
         testCompile 'log4j:log4j:1.2.16'
 
@@ -97,4 +97,4 @@ project(':rss-edge') {
         from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
         manifest { attributes 'Main-Class': 'com.netflix.recipes.rss.server.EdgeServer' }
     }
-}
+}

rss-edge/src/main/java/com/netflix/recipes/rss/server/EdgeServer.java

@@ -35,10 +35,10 @@ public EdgeServer() {
 
 	public static void main(final String[] args) throws Exception {
 		System.setProperty("archaius.deployment.applicationId", "edge");
-    	System.setProperty(PropertyNames.SERVER_BOOTSTRAP_BASE_PACKAGES_OVERRIDE, "com.netflix");
+		System.setProperty(PropertyNames.SERVER_BOOTSTRAP_BASE_PACKAGES_OVERRIDE, "com.netflix");
 
 		String appId = ConfigurationManager.getDeploymentContext().getApplicationId();
-        String env = ConfigurationManager.getDeploymentContext().getDeploymentEnvironment();
+		String env = ConfigurationManager.getDeploymentContext().getDeploymentEnvironment();
 
 		// populate the eureka-specific properties
 		System.setProperty("eureka.client.props", appId);
@@ -49,4 +49,4 @@ public static void main(final String[] args) throws Exception {
 		EdgeServer edgeServer = new EdgeServer();
 		edgeServer.start();
 	}
-}
+}