diff options
| author |   Manuel Rüger <mrueg@gentoo.org> | 2015-02-28 15:47:13 +0000 |
|---|---|---|
| committer | Manuel Rüger <mrueg@gentoo.org> | 2015-02-28 15:47:13 +0000 |
| commit | 1c64f05bf44df9a8ef2c4669db1a7479f8f3b5ca (patch) | |
| tree | 377a13230fe8912419c0a7e39daa9cd1c388c851 /profiles | |
| parent | version bump, drop old (diff) | |
| download | gentoo-2-1c64f05bf44df9a8ef2c4669db1a7479f8f3b5ca.tar.gz gentoo-2-1c64f05bf44df9a8ef2c4669db1a7479f8f3b5ca.tar.bz2 gentoo-2-1c64f05bf44df9a8ef2c4669db1a7479f8f3b5ca.zip | |
Keep dev-ruby/mixlib-shellout in tree.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/package.mask | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index aaafb2010712..0984de40c21f 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,14 @@ .# ChangeLog for profile directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9830 2015/02/28 15:26:06 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9831 2015/02/28 15:47:12 mrueg Exp $ # # This ChangeLog should include records for all changes in profiles directory. # Only typo fixes which don't affect portage/repoman behaviour could be avoided # here. If in doubt put a record here! + 28 Feb 2015; Manuel Rüger <mrueg@gentoo.org> package.mask: + Keep dev-ruby/mixlib-shellout in tree. + 28 Feb 2015; Tomáš Chvátal <scarabeus@gentoo.org> package.mask: Mask libsolv and zypper for removal as they are just experiment that didn't go further. diff --git a/profiles/package.mask b/profiles/package.mask index 620db7577b90..c3181259f5da 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16390 2015/02/28 15:26:06 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16391 2015/02/28 15:47:13 mrueg Exp $ # # When you add an entry to the top of this file, add your name, the date, and # an explanation of why something is getting masked. Please be extremely @@ -71,7 +71,6 @@ dev-ruby/mixlib-authentication dev-ruby/mixlib-cli dev-ruby/mixlib-config dev-ruby/mixlib-log -dev-ruby/mixlib-shellout dev-ruby/ohai =dev-ruby/rest-client-1.6.7-r1 |