From: W. Trevor King <wking@tremily.us>
Date: Tue, 7 Oct 2014 18:47:27 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/dev-python/pytest-xdist'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9744bea5e22dc9fbb91d60871b242484a0d7a829;p=wtk-overlay.git

Merge remote-tracking branch 'origin/dev-python/pytest-xdist'

Pull in this per-package branch with a subtree merge [1]:

  $ git merge -s ours --no-commit origin/dev-python/pytest-xdist
  $ git read-tree --prefix=dev-python/dev-python/pytest-xdist/ -u origin/dev-python/pytest-xdist
  $ git commit -v

so folks who aren't using a version of Layman that supports submodules
(currently everybody) can use this modular package.

[1]: https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html
---

9744bea5e22dc9fbb91d60871b242484a0d7a829
diff --cc dev-python/pytest-xdist/Manifest
index 0000000,3fd5058..3fd5058
mode 000000,100644..100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
diff --cc dev-python/pytest-xdist/pytest-xdist-1.11.ebuild
index 0000000,c485a15..c485a15
mode 000000,120000..120000
--- a/dev-python/pytest-xdist/pytest-xdist-1.11.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.11.ebuild
diff --cc dev-python/pytest-xdist/pytest-xdist-9999.ebuild
index 0000000,b151451..b151451
mode 000000,100644..100644
--- a/dev-python/pytest-xdist/pytest-xdist-9999.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-9999.ebuild