[felix-framework] 02/03: Merge tag 'upstream/4.6.1'

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository felix-framework.

commit f5af88eca595b43065b5c0b76cffd9cae9f3a75f
Merge: 1add89b d780634
Author: Markus Koschany <apo at gambaru.de>
Date:   Thu Mar 19 20:10:58 2015 +0100

    Merge tag 'upstream/4.6.1'
    
    Upstream version 4.6.1
    
    # gpg: Signature made Thu 19 Mar 2015 20:10:54 CET using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]

 doc/changelog.txt                                  |  8 +++
 pom.xml                                            |  8 +--
 .../apache/felix/framework/BundleContextImpl.java  | 79 ++++------------------
 .../java/org/apache/felix/framework/Felix.java     |  4 +-
 .../apache/felix/framework/ServiceRegistry.java    | 34 ++++++++--
 .../apache/felix/framework/cache/JarContent.java   |  4 +-
 .../felix/framework/util/WeakZipFileFactory.java   | 43 +++++++++---
 7 files changed, 89 insertions(+), 91 deletions(-)

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