commit:     2a77bbf423d2db7d3462c520206a0d7adb3a3765
Author:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 07:17:54 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 07:19:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a77bbf4

Merge remote-tracking branch 'remotes/hydrapolic/vagrant'

Pull request: https://github.com/gentoo/gentoo/pull/677

 app-emulation/vagrant/Manifest                     |   2 +-
 .../vagrant/files/vagrant-1.2.1-no-warning.patch   |  12 --
 .../vagrant/files/vagrant-1.2.2-rvm.patch          |  12 --
 app-emulation/vagrant/files/vagrant-1.8.1          |  46 ++++++++
 .../vagrant-1.8.1-disable-embedded-cacert.patch    |  17 +++
 ...agrant-1.8.1-install-plugins-in-isolation.patch | 122 +++++++++++++++++++++
 .../vagrant/files/vagrant-1.8.1-rvm.patch          |  11 ++
 app-emulation/vagrant/metadata.xml                 |  20 +++-
 app-emulation/vagrant/vagrant-1.4.3-r2.ebuild      |  69 ------------
 app-emulation/vagrant/vagrant-1.8.1.ebuild         |  87 +++++++++++++++
 dev-ruby/hashicorp-checkpoint/Manifest             |   1 +
 .../hashicorp-checkpoint-0.1.4.ebuild              |  24 ++++
 .../hashicorp-checkpoint}/metadata.xml             |   0
 13 files changed, 323 insertions(+), 100 deletions(-)

Reply via email to