summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-02-15 11:44:52 +0000
committerJeroen Roovers <jer@gentoo.org>2014-02-15 11:44:52 +0000
commit3b1d3d5b65dd319fd81b8d3d47406c1c890b7621 (patch)
tree01856513806306c727482f9ac23d38a7b655d73f /profiles
parentx11-libs/qwtpolar: Version Bump (diff)
downloadgentoo-2-3b1d3d5b65dd319fd81b8d3d47406c1c890b7621.tar.gz
gentoo-2-3b1d3d5b65dd319fd81b8d3d47406c1c890b7621.tar.bz2
gentoo-2-3b1d3d5b65dd319fd81b8d3d47406c1c890b7621.zip
Fix encoding (bug #501348 by Harry STARR).
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/desc/uwsgi_plugins.desc4
2 files changed, 6 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 53d111d6c1ea..c7bc4e0b9cab 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8609 2014/02/15 10:44:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8610 2014/02/15 11:44:51 jer 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!
+ 15 Feb 2014; Jeroen Roovers <jer@gentoo.org> desc/uwsgi_plugins.desc:
+ Fix encoding (bug #501348 by Harry STARR).
+
15 Feb 2014; Michał Górny <mgorny@gentoo.org> package.mask:
Unmask systemd-sysv-utils now that are tools are moved to util-linux-ng, bug
#430912.
diff --git a/profiles/desc/uwsgi_plugins.desc b/profiles/desc/uwsgi_plugins.desc
index e35d7e64ddf7..61160a932ded 100644
--- a/profiles/desc/uwsgi_plugins.desc
+++ b/profiles/desc/uwsgi_plugins.desc
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/desc/uwsgi_plugins.desc,v 1.2 2014/02/11 18:33:45 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/uwsgi_plugins.desc,v 1.3 2014/02/15 11:44:52 jer Exp $
# This file contains descriptions of UWSGI_PLUGINS USE_EXPAND flags.
@@ -22,7 +22,7 @@ emperor_zeromq - Enable an emperor controlled via ZeroMQ
fastrouter - Proxy/load-balancer/router speaking the uwsgi protocol
forkptyrouter - Pseudoterminal server to connect to instances running inside a jail/separate namespace
geoip - Export GeoIP information as routing variables (requires dev-libs/geoip)
-graylog2 - Send logs to a Graylog2 server in Graylog2’s native GELF format
+graylog2 - Send logs to a Graylog2 server in Graylog2's native GELF format
http - make uWSGI natively speak HTTP, using this plugin you do not need a front-end HTTP server
ldap - Lets you configure the uWSGI server via LDAP
legion_cache_fetch - caching for the legion subsystem