You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by ma...@apache.org on 2014/01/15 22:38:11 UTC
[48/50] [abbrv] git commit: import reorg.
import reorg.
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/1a44473e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/1a44473e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/1a44473e
Branch: refs/heads/mansu/AURORA-4187_scheduler_home_page-no-seed
Commit: 1a44473eb8c294a97691032f074562b80b7d9d1b
Parents: 613f1d8
Author: Suman Karumuri <sk...@twitter.com>
Authored: Mon Jan 13 15:24:12 2014 -0800
Committer: Suman Karumuri <sk...@twitter.com>
Committed: Mon Jan 13 15:24:40 2014 -0800
----------------------------------------------------------------------
.../java/org/apache/aurora/scheduler/http/DisplayUtils.java | 6 +++---
.../java/org/apache/aurora/scheduler/http/ServletModule.java | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1a44473e/src/main/java/org/apache/aurora/scheduler/http/DisplayUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/DisplayUtils.java b/src/main/java/org/apache/aurora/scheduler/http/DisplayUtils.java
index e156c72..65676b9 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/DisplayUtils.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/DisplayUtils.java
@@ -18,13 +18,13 @@ package org.apache.aurora.scheduler.http;
import com.google.common.base.Function;
import com.google.common.collect.Ordering;
+import com.twitter.common.args.Arg;
+import com.twitter.common.args.CmdLine;
+
import org.apache.aurora.scheduler.MesosTaskFactory.MesosTaskFactoryImpl;
import org.apache.aurora.scheduler.http.SchedulerzRole.Job;
import org.apache.aurora.scheduler.storage.entities.IJobKey;
-import com.twitter.common.args.Arg;
-import com.twitter.common.args.CmdLine;
-
/**
* Utility class to hold common display helper functions.
*/
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/1a44473e/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java b/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
index 70bfdb6..5b0a0d6 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/ServletModule.java
@@ -32,10 +32,6 @@ import com.sun.jersey.api.container.filter.GZIPContentEncodingFilter;
import com.sun.jersey.guice.JerseyServletModule;
import com.sun.jersey.guice.spi.container.servlet.GuiceContainer;
-import org.apache.aurora.scheduler.quota.QuotaManager;
-import org.apache.aurora.scheduler.state.CronJobManager;
-import org.apache.aurora.scheduler.state.SchedulerCore;
-
import com.twitter.common.application.http.Registration;
import com.twitter.common.application.modules.LifecycleModule;
import com.twitter.common.application.modules.LocalServiceRegistry;
@@ -44,6 +40,10 @@ import com.twitter.common.net.pool.DynamicHostSet;
import com.twitter.common.net.pool.DynamicHostSet.MonitorException;
import com.twitter.thrift.ServiceInstance;
+import org.apache.aurora.scheduler.quota.QuotaManager;
+import org.apache.aurora.scheduler.state.CronJobManager;
+import org.apache.aurora.scheduler.state.SchedulerCore;
+
import static com.sun.jersey.api.core.ResourceConfig.PROPERTY_CONTAINER_REQUEST_FILTERS;
import static com.sun.jersey.api.core.ResourceConfig.PROPERTY_CONTAINER_RESPONSE_FILTERS;
import static com.sun.jersey.api.json.JSONConfiguration.FEATURE_POJO_MAPPING;