[rpms/trafficserver] trafficserver-9.2.14-1: Merge branch 'master' into epel7

[Jan-Frode Myklebust <janfrode@tanso.net>]

A new commit has been pushed.

Repo   : rpms/trafficserver
Branch : trafficserver-9.2.14-1
Commit : 7b1ac3ca60f3ddf1e7c47865e043ebded60478e7
Author : Jan-Frode Myklebust <janfrode@tanso.net>
Date   : 2014-04-30T22:29:31+02:00
Stats  : +4/-1 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/trafficserver/c/7b1ac3ca60f3ddf1e7c47865e043ebded60478e7?branch=trafficserver-9.2.14-1

Log:
Merge branch 'master' into epel7

---
diff --git a/trafficserver.spec b/trafficserver.spec
index c760c1a..3ae014b 100644
--- a/trafficserver.spec
+++ b/trafficserver.spec
@@ -3,7 +3,7 @@
 Summary:	Fast, scalable and extensible HTTP/1.1 compliant caching proxy server
 Name:		trafficserver
 Version:	4.2.1
-Release:	rc1%{?dist}
+Release:	2%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Daemons
 Source0:	http://www.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2
@@ -219,6 +219,9 @@ header files, and Apache httpd style module build system.
 %attr(0644,root,root) %{_libdir}/trafficserver/*.so
 
 %changelog
+* Wed Apr 30 2014 Jan-Frode Myklebust <janfrode@tanso.net> - 4.2.1-2
+- Bump release tag. RC1 became final.
+
 * Sat Apr 26 2014 Jan-Frode Myklebust <janfrode@tanso.net> - 4.2.1-rc1
 - Update to 4.2.1-RC1