From 6355c3e8d0cc2b967edb2c06016cf3962a5b0748 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Fri, 6 Dec 2013 13:26:09 +0100
Subject: [PATCH] add glob support for rsyncignores, add command line option to
 pass additional rsyncignores. Thanks Anatoly Bubenkov.

---
 CHANGELOG       | 4 +++-
 xdist/plugin.py | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index dd4ee2e..f5ff648 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,9 @@
 1.10 unreleased
 -------------------------
 
-- add glob support for rsyncignores, add command line option to pass additional rsyncignores
+- add glob support for rsyncignores, add command line option to pass
+  additional rsyncignores. Thanks Anatoly Bubenkov.
+
 - fix pytest issue382 - produce "pytest_runtest_logstart" event again
   in master. Thanks Aron Curzon.
 
diff --git a/xdist/plugin.py b/xdist/plugin.py
index 378e812..1c9a891 100644
--- a/xdist/plugin.py
+++ b/xdist/plugin.py
@@ -67,8 +67,6 @@ def pytest_configure(config, __multicall__):
         tr = config.pluginmanager.getplugin("terminalreporter")
         tr.showfspath = False
 
-
-
 def check_options(config):
     if config.option.numprocesses:
         config.option.dist = "load"