From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-846037-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 822F31384B4
	for <garchives@archives.gentoo.org>; Thu, 12 Nov 2015 19:28:41 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 51C6921C011;
	Thu, 12 Nov 2015 19:28:39 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 00CD321C011
	for <gentoo-commits@lists.gentoo.org>; Thu, 12 Nov 2015 19:28:38 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 9387734074D
	for <gentoo-commits@lists.gentoo.org>; Thu, 12 Nov 2015 19:28:37 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id A0F451470
	for <gentoo-commits@lists.gentoo.org>; Thu, 12 Nov 2015 19:28:31 +0000 (UTC)
From: "Brian Dolbec" <dolsen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" <dolsen@gentoo.org>
Message-ID: <1447356402.0cf294d33a466f4a3c537aa82d385ec7f87c7bf3.dolsen@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: /
X-VCS-Repository: proj/portage
X-VCS-Committer: dolsen
X-VCS-Committer-Name: Brian Dolbec
X-VCS-Revision: 0cf294d33a466f4a3c537aa82d385ec7f87c7bf3
X-VCS-Branch: master
Date: Thu, 12 Nov 2015 19:28:31 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 4a896116-7455-4e22-abdc-14c3ec8a0e2d
X-Archives-Hash: 6fd678ed99760b704a6e1bef6af0cf19
Message-ID: <20151112192831.XS0SwvuxdzDR6sofPcn7MEfhB0c-peRIxrw2svnu9zQ@z>

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(-)