[tomcat: 2/2] Fix Merge

[Ivan Afonichev]

commit 86b2d177cf00f6ebaf978f1ad0c43cb100f185be
Merge: a4cdf56 2178fab
Author: Ivan Afonichev <ivan.afonichev at gmail.com>
Date:   Thu Jan 12 01:55:49 2012 +0400

    Fix Merge

 add_entity_resolver_setter.patch |   19 +++++++++++++++++++
 tomcat.spec                      |    9 +++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)
---
diff --cc tomcat.spec
index 3fd188d,4171f42..51a7fc6
--- a/tomcat.spec
+++ b/tomcat.spec
@@@ -615,13 -617,9 +617,16 @@@ f
  %{_initrddir}/%{name}
  
  %changelog
- * Mon Dec 12 2011 Joseph D. Wagner <joe at josephdwagner.info> 0:7.0.23-2
++* Mon Dec 12 2011 Joseph D. Wagner <joe at josephdwagner.info> 0:7.0.23-3
 +- Added support to /usr/sbin/tomcat-sysd and /usr/sbin/tomcat for
 +  starting tomcat with jsvc, which allows tomcat to perform some
 +  privileged operations (e.g. bind to a port < 1024) and then switch
 +  identity to a non-privileged user. Must add USE_JSVC="true" to
 +  /etc/tomcat/tomcat.conf or /etc/sysconfig/tomcat.
 +
+ * Wed Jan 11 2012 Alexander Kurtakov <akurtako at redhat.com> 0:7.0.23-2
+ - Add EntityResolver setter patch to jasper for jetty's need. (patch sent upstream).
+ 
  * Mon Nov 28 2011 Ivan Afonichev <ivan.afonichev at gmail.com> 0:7.0.23-1
  - Updated to 7.0.23