commit:     0cf294d33a466f4a3c537aa82d385ec7f87c7bf3
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 19:26:42 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 19:26:42 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=0cf294d3

Merge branch 'master' of git+ssh://git.gentoo.org/proj/portage

 bin/egencache                            | 70 +++++++++++++++++++-------------
 bin/install-qa-check.d/60openrc          |  2 +-
 bin/save-ebuild-env.sh                   |  2 +-
 man/portage.5                            |  7 +++-
 misc/emerge-delta-webrsync               |  2 +-
 pym/portage/emaint/modules/sync/sync.py  | 57 ++++++++++++++++++++++----
 pym/portage/repository/config.py         |  6 ++-
 pym/portage/sync/controller.py           | 18 +++++---
 pym/portage/sync/modules/git/git.py      | 11 ++++-
 pym/portage/sync/modules/rsync/rsync.py  | 17 ++++----
 pym/portage/util/_async/AsyncFunction.py |  5 ++-
 11 files changed, 139 insertions(+), 58 deletions(-)

Reply via email to