[jenkins-instance-identity] 02/10: Merge tag 'upstream/1.5'

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository jenkins-instance-identity.

commit 75a0f58b5a8f7e58aa6cd60b77347c90b8ad24a8
Merge: 360965e cb3a23f
Author: Markus Koschany <apo at debian.org>
Date:   Thu Dec 3 16:04:20 2015 +0100

    Merge tag 'upstream/1.5'
    
    Upstream version 1.5

 pom.xml                                            |   7 ++-
 .../instance_identity/InstanceIdentity.java        |  65 ++++++++++++++-------
 .../instance_identity/InstanceIdentityTest.java    |  29 ++++++++-
 .../InstanceIdentityTest/identityKeyCorrupted.zip  | Bin 0 -> 3924 bytes
 .../InstanceIdentityTest/identityKeyNotExist.zip   | Bin 0 -> 2087 bytes
 5 files changed, 75 insertions(+), 26 deletions(-)

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