[sisu-guice] 02/02: Merge branch 'master' of git://git.debian.org/git/pkg-java/sisu-guice

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository sisu-guice.

commit 433f75b61de2268b309460c763b32aa21beddd6c
Merge: 995277f ce6bd5b
Author: tony mancill <tmancill at debian.org>
Date:   Tue Mar 18 06:53:20 2014 -0700

    Merge branch 'master' of git://git.debian.org/git/pkg-java/sisu-guice
    
    Conflicts:
    	debian/changelog

 PATCHES/GUICE_697_add_missing_headers.patch        | 102 ++++++++++++++++++++-
 PATCHES/GUICE_745_getpathinfo_not_decoded.patch    |  60 ++++++++++++
 PATCHES/SISUFY.patch                               |   2 +-
 core/pom.xml                                       |   2 +-
 debian/changelog                                   |   7 ++
 extensions/assistedinject/pom.xml                  |   2 +-
 extensions/grapher/pom.xml                         |   2 +-
 extensions/jmx/pom.xml                             |   2 +-
 extensions/jndi/pom.xml                            |   2 +-
 extensions/multibindings/pom.xml                   |   2 +-
 extensions/persist/pom.xml                         |   2 +-
 extensions/pom.xml                                 |   2 +-
 extensions/servlet/pom.xml                         |   2 +-
 .../google/inject/servlet/ServletDefinition.java   |  10 ++
 .../inject/servlet/ServletDefinitionPathsTest.java |   9 ++
 extensions/spring/pom.xml                          |   2 +-
 extensions/struts2/pom.xml                         |   2 +-
 extensions/throwingproviders/pom.xml               |   2 +-
 pom.xml                                            |   2 +-
 19 files changed, 199 insertions(+), 17 deletions(-)

diff --cc debian/changelog
index f7855f3,1d30bf5..5ed6d06
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,17 @@@
+ sisu-guice (3.1.10+dfsg-1) unstable; urgency=low
+ 
+   * Team upload.
+   * New upstream release.
+ 
+  -- Eugene Zhukov <jevgeni.zh at gmail.com>  Mon, 17 Mar 2014 11:03:25 +0000
+ 
 +sisu-guice (3.1.9+dfsg-3) unstable; urgency=medium
 +
 +  * Team upload.
 +  * Fix Built-Using field to reference source package names.
 +
 + -- tony mancill <tmancill at debian.org>  Tue, 11 Feb 2014 22:40:19 -0800
 +
  sisu-guice (3.1.9+dfsg-2) unstable; urgency=medium
  
    * Team upload.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-guice.git