Merge branch 'master' of github.com:elasticsearch/elasticsearch

This commit is contained in:
Brian Murphy 2014-07-21 16:11:12 +01:00
commit eb2898537e
1 changed files with 0 additions and 3 deletions

View File

@ -19,7 +19,6 @@
package org.elasticsearch.plugin;
import com.google.common.base.Predicate;
import org.apache.lucene.util.LuceneTestCase;
import org.elasticsearch.ElasticsearchIllegalArgumentException;
import org.elasticsearch.ElasticsearchTimeoutException;
import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
@ -46,7 +45,6 @@ import org.junit.Test;
import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.nio.file.Files;
import java.util.concurrent.TimeUnit;
import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
@ -91,7 +89,6 @@ public class PluginManagerTests extends ElasticsearchIntegrationTest {
}
@Test
@LuceneTestCase.AwaitsFix(bugUrl = "@uboness works on this")
public void testLocalPluginInstallWithBinAndConfig() throws Exception {
String pluginName = "plugin-test";
Tuple<Settings, Environment> initialSettings = InternalSettingsPreparer.prepareSettings(