Repository: aurora Updated Branches: refs/heads/master 66a4d5fdd -> 2da17009c
Remove scheduler flag -extra_modules. Reviewed at https://reviews.apache.org/r/42645/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/2da17009 Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/2da17009 Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/2da17009 Branch: refs/heads/master Commit: 2da17009c18b4018c9d5f5e1f7f86111bea3a0bb Parents: 66a4d5f Author: Bill Farner <[email protected]> Authored: Fri Jan 22 11:30:04 2016 -0800 Committer: Bill Farner <[email protected]> Committed: Fri Jan 22 11:30:04 2016 -0800 ---------------------------------------------------------------------- NEWS | 1 + .../java/org/apache/aurora/scheduler/app/SchedulerMain.java | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/2da17009/NEWS ---------------------------------------------------------------------- diff --git a/NEWS b/NEWS index 37a7a79..c9ff025 100644 --- a/NEWS +++ b/NEWS @@ -29,6 +29,7 @@ - Added new scheduler flag `-default_docker_parameters` to allow a cluster operator to specify a universal set of parameters that should be used for every container that does not have parameters explicitly configured at the job level. +- Removed scheduler flag `-extra_modules`. 0.11.0 ------ http://git-wip-us.apache.org/repos/asf/aurora/blob/2da17009/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java b/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java index 0659c35..cd9cb09 100644 --- a/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java +++ b/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java @@ -25,7 +25,6 @@ import javax.inject.Inject; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; import com.google.common.net.HostAndPort; import com.google.inject.AbstractModule; import com.google.inject.Guice; @@ -83,11 +82,6 @@ public class SchedulerMain { @CmdLine(name = "serverset_path", help = "ZooKeeper ServerSet path to register at.") private static final Arg<String> SERVERSET_PATH = Arg.create(); - @CmdLine(name = "extra_modules", - help = "A list of modules that provide additional functionality.") - private static final Arg<List<Class<? extends Module>>> EXTRA_MODULES = - Arg.create(ImmutableList.of()); - // TODO(Suman Karumuri): Rename viz_job_url_prefix to stats_job_url_prefix for consistency. @CmdLine(name = "viz_job_url_prefix", help = "URL prefix for job container stats.") private static final Arg<String> STATS_URL_PREFIX = Arg.create(""); @@ -208,7 +202,6 @@ public class SchedulerMain { new LibMesosLoadingModule(), new MesosLogStreamModule(FlaggedClientConfig.create()), new LogStorageModule()) - .addAll(Iterables.transform(EXTRA_MODULES.get(), MoreModules::getModule)) .build(); flagConfiguredMain(Modules.combine(modules)); }
