[geronimo-osgi-support] 01/02: Merge tag 'upstream/1.1'

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository geronimo-osgi-support.

commit 56e6e6c3a5c6206582051a5f7bf0a8f49df7d03f
Merge: 6f6ecf4 cc9ab17
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 2 19:29:45 2015 +0200

    Merge tag 'upstream/1.1'
    
    Upstream version 1.1

 LICENSE                                            | 54 ----------------------
 NOTICE                                             | 18 +-------
 geronimo-osgi-itesta/pom.xml                       |  8 ++--
 geronimo-osgi-itestb/pom.xml                       |  8 ++--
 geronimo-osgi-locator-itests/pom.xml               |  5 +-
 geronimo-osgi-locator/pom.xml                      |  8 ++--
 .../geronimo/osgi/locator/ProviderLocator.java     | 14 +++++-
 geronimo-osgi-registry-itests/pom.xml              |  5 +-
 geronimo-osgi-registry/pom.xml                     |  8 ++--
 .../apache/geronimo/osgi/registry/Activator.java   |  2 -
 .../registry/ProviderBundleTrackerCustomizer.java  |  1 -
 .../osgi/registry/ProviderRegistryImpl.java        | 48 +++++++++++--------
 pom.xml                                            | 12 ++---
 13 files changed, 69 insertions(+), 122 deletions(-)

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