summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2011-07-23 10:50:56 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2011-07-23 10:50:56 +0000
commitdbc74dff35d970e44b0914600c36402be269fb60 (patch)
treeb41d18002949079e90354092be122f1e0bc5d7dc /profiles
parentVersion bump (diff)
downloadgentoo-2-dbc74dff35d970e44b0914600c36402be269fb60.tar.gz
gentoo-2-dbc74dff35d970e44b0914600c36402be269fb60.tar.bz2
gentoo-2-dbc74dff35d970e44b0914600c36402be269fb60.zip
bring net-analyzer/ntop to testing tree
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask6
2 files changed, 5 insertions, 6 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 111d066ccf1a..e3c5e4e331f3 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5564 2011/07/23 07:30:52 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5565 2011/07/23 10:50:55 hwoarang 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!
+ 23 Jul 2011; Markos Chandras <hwoarang@gentoo.org> package.mask:
+ bring net-analyzer/ntop to testing tree
+
23 Jul 2011; Hans de Graaff <graaff@gentoo.org> updates/3Q-2011:
Add slotmoves for dev-ruby/rack-test.
diff --git a/profiles/package.mask b/profiles/package.mask
index c1bee37932a4..da10fed46314 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12931 2011/07/22 19:06:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12932 2011/07/23 10:50:56 hwoarang 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
@@ -333,10 +333,6 @@ net-wireless/kbluetooth
=net-im/emesene-2*
# Markos Chandras <hwoarang@gentoo.org> (26 May 2011)
-# Masked for testng . Bug #347393
-=net-analyzer/ntop-4.0.3
-
-# Markos Chandras <hwoarang@gentoo.org> (26 May 2011)
# Masked for testing. Bug #308449
=net-dialup/freeradius-2.1.10