[jenkins-remoting] 02/03: Merge tag 'upstream/2.32'

[James Downing Page]

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

jamespage pushed a commit to branch master
in repository jenkins-remoting.

commit 59d0368373a435b0d4ff59141960262388a48d09
Merge: 3baa407 247089c
Author: James Page <james.page at ubuntu.com>
Date:   Sun Jan 26 14:31:29 2014 +0000

    Merge tag 'upstream/2.32'
    
    Upstream version 2.32

 debian/maven.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc debian/maven.properties
index 17a452d,0000000..44fc385
mode 100644,000000..100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@@ -1,11 -1,0 +1,11 @@@
 +# Include here properties to pass to Maven during the build.
 +# For example:
- maven.test.skip=true
++# maven.test.skip=true
 +# Specify code source and target as not explicit in pom.xml
 +# and defaults to 1.3
 +maven.compiler.source=1.5
 +maven.compiler.target=1.5
 +# Keystore information for signing jar (self signed)
 +hudson.sign.alias=jenkins
 +hudson.sign.storepass=jenkins
 +hudson.sign.keystore=src/test/keystore/dummy.keystore

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