Changed Trapd executor call to be async again since the
WaterfallExecutor call is synchronous. This restores performance in
processing incoming traps.
Merge branch '1.12'
Removed Alarm UI facade class and changed the UI to use OnmsAlarm
instances directly.
bump everything that asks for 1.6 to 1.7
Add a variant of provision.pl snmp get that works in backticks with snmpget et al
add an explicit osgi dependency to solve generics-related compilation issues with JDK 7 (see http://blog.osgi.org/2012/10/43-companion-code-for-java-7.html for details)
Add an LDAP user and group Saugblaser suite in Perl to contrib
fix detection of .jnilib JNI libraries on Java 7 on Mac OS X
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge branch '1.12'
Merge remote-tracking branch 'opennms/master' into features/java7