Merge remote-tracking branch 'origin/dev-python/pytest-xdist'
authorW. Trevor King <wking@tremily.us>
Tue, 7 Oct 2014 18:47:27 +0000 (11:47 -0700)
committerW. Trevor King <wking@tremily.us>
Tue, 7 Oct 2014 18:47:27 +0000 (11:47 -0700)
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

1  2 
dev-python/pytest-xdist/Manifest
dev-python/pytest-xdist/pytest-xdist-1.11.ebuild
dev-python/pytest-xdist/pytest-xdist-9999.ebuild

index 0000000000000000000000000000000000000000,3fd5058cb09a9e78d96b49d816200ec5e6274ff0..3fd5058cb09a9e78d96b49d816200ec5e6274ff0
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,c485a1534f6aa6a958d7a39145f5e53b0da55f92..c485a1534f6aa6a958d7a39145f5e53b0da55f92
mode 000000,120000..120000
--- /dev/null
index 0000000000000000000000000000000000000000,b151451ee37789cc770ffde7b2cf28a61b904858..b151451ee37789cc770ffde7b2cf28a61b904858
mode 000000,100644..100644
--- /dev/null