[shiro] 02/06: Merge tag 'upstream/1.2.3'

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository shiro.

commit 43a104e2d90f849860de9fbbdcaa410dcf9f4499
Merge: 2fb7eed 6eefedf
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Oct 10 00:08:59 2014 +0200

    Merge tag 'upstream/1.2.3'
    
    Upstream version 1.2.3

 all/pom.xml                                        |   2 +-
 core/pom.xml                                       |   2 +-
 .../realm/ldap/DefaultLdapContextFactory.java      |  62 +++++++++++-
 .../shiro/realm/ldap/JndiLdapContextFactory.java   |  42 ++++++++
 .../realm/ldap/DefaultLdapContextFactoryTest.java  | 106 +++++++++++++++++++++
 .../realm/ldap/JndiLdapContextFactoryTest.java     |  26 +++++
 pom.xml                                            |  38 +++++---
 samples/aspectj/pom.xml                            |   2 +-
 samples/pom.xml                                    |   2 +-
 samples/quickstart/pom.xml                         |   2 +-
 samples/spring-client/pom.xml                      |   2 +-
 samples/spring-hibernate/pom.xml                   |   2 +-
 samples/spring/pom.xml                             |   2 +-
 samples/web/pom.xml                                |   2 +-
 support/aspectj/pom.xml                            |   2 +-
 support/cas/pom.xml                                |   2 +-
 support/ehcache/pom.xml                            |   2 +-
 support/features/pom.xml                           |   2 +-
 support/guice/pom.xml                              |   2 +-
 support/pom.xml                                    |   2 +-
 support/quartz/pom.xml                             |   2 +-
 support/spring/pom.xml                             |   2 +-
 tools/hasher/pom.xml                               |   2 +-
 tools/pom.xml                                      |   2 +-
 web/pom.xml                                        |   2 +-
 25 files changed, 277 insertions(+), 37 deletions(-)

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