Skip to content
This repository has been archived by the owner on Mar 4, 2021. It is now read-only.

Commit

Permalink
tidy up imports, remove weird character in comments
Browse files Browse the repository at this point in the history
  • Loading branch information
ebukoski committed Jun 29, 2016
1 parent 92297f7 commit 4d5b3de
Showing 1 changed file with 12 additions and 13 deletions.
Expand Up @@ -17,17 +17,6 @@
*/
package com.netflix.simianarmy.basic;

import java.io.InputStream;
import java.lang.reflect.Constructor;
import java.util.LinkedList;
import java.util.Map.Entry;
import java.util.Properties;
import java.util.concurrent.TimeUnit;

import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.amazonaws.ClientConfiguration;
import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
Expand All @@ -41,9 +30,19 @@
import com.netflix.simianarmy.MonkeyRecorder.Event;
import com.netflix.simianarmy.MonkeyScheduler;
import com.netflix.simianarmy.aws.RDSRecorder;
import com.netflix.simianarmy.aws.SimpleDBRecorder;
import com.netflix.simianarmy.aws.STSAssumeRoleSessionCredentialsProvider;
import com.netflix.simianarmy.aws.SimpleDBRecorder;
import com.netflix.simianarmy.client.aws.AWSClient;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.InputStream;
import java.lang.reflect.Constructor;
import java.util.LinkedList;
import java.util.Map.Entry;
import java.util.Properties;
import java.util.concurrent.TimeUnit;

/**
* The Class BasicSimianArmyContext.
Expand Down Expand Up @@ -108,7 +107,7 @@ public class BasicSimianArmyContext implements Monkey.Context {
/** protected constructor as the Shell is meant to be subclassed. */
protected BasicSimianArmyContext(String... configFiles) {
eventReport = new LinkedList<Event>();
// Load the config files into props following the provided order.ø
// Load the config files into props following the provided order.
for (String configFile : configFiles) {
loadConfigurationFileIntoProperties(configFile);
}
Expand Down

0 comments on commit 4d5b3de

Please sign in to comment.