[osgi-core] 04/07: Merge tag 'upstream/4.3.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 osgi-core.

commit 92251151c968d7e384a7881dc8fa02143d7203b3
Merge: 27a604b 841f508
Author: Markus Koschany <apo at gambaru.de>
Date:   Sun Mar 16 20:12:18 2014 +0100

    Merge tag 'upstream/4.3.1'
    
    Upstream version 4.3.1
    
    # gpg: Signature made Sun 16 Mar 2014 20:12:14 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]

 about.html                                         |  2 +-
 src/META-INF/MANIFEST.MF                           | 57 +++++++++---------
 src/bnd.bnd                                        |  8 +--
 src/org/osgi/framework/Bundle.java                 | 40 ++++++-------
 src/org/osgi/framework/BundleContext.java          | 68 +++++++++++-----------
 src/org/osgi/framework/BundleEvent.java            |  6 +-
 src/org/osgi/framework/BundleListener.java         | 24 ++++----
 src/org/osgi/framework/Constants.java              | 13 +++--
 src/org/osgi/framework/Filter.java                 |  9 +--
 src/org/osgi/framework/FrameworkListener.java      | 23 ++++----
 src/org/osgi/framework/InvalidSyntaxException.java |  7 ++-
 src/org/osgi/framework/ServiceEvent.java           | 28 ++++-----
 src/org/osgi/framework/ServiceFactory.java         | 10 ++--
 src/org/osgi/framework/ServiceReference.java       | 37 ++++++------
 src/org/osgi/framework/ServiceRegistration.java    | 34 +++++------
 .../osgi/framework/SynchronousBundleListener.java  | 39 ++++++-------
 .../framework/startlevel/FrameworkStartLevel.java  |  6 +-
 .../osgi/service/condpermadmin/ConditionInfo.java  |  6 +-
 .../condpermadmin/ConditionalPermissionAdmin.java  | 42 +++++++------
 .../condpermadmin/ConditionalPermissionInfo.java   |  6 +-
 .../condpermadmin/ConditionalPermissionUpdate.java | 18 +++---
 .../osgi/service/packageadmin/ExportedPackage.java | 10 ++--
 .../service/permissionadmin/PermissionInfo.java    | 10 ++--
 src/org/osgi/service/startlevel/StartLevel.java    |  6 +-
 .../osgi/service/url/URLStreamHandlerSetter.java   | 15 +++--
 25 files changed, 260 insertions(+), 264 deletions(-)

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