this test should have only been for 1.11
Merge branch 'master' of ssh://opennms.git.sourceforge.net/gitroot/opennms/opennms
these tests were wrong, and probably relying on undefined behavior when a node has no nodeType set
this test should have only been for 1.11
these tests were wrong, and probably relying on undefined behavior when a node has no nodeType set
Revert "this test should have only been for 1.11"

This reverts commit cf643e8c2f11452c4cca98b1b006e5ae9e4cd630.
default values should be in the getter when converting to JAXB
NMS-5156 add the eclipse formatter to src/main/eclipse
Got rid of unreachable exception block in LegacyLocalJasperReportsDao.
Minor javadoc, interface, and exception handling updates.
Removed unnecessary indirection through the EventProxy interface in
favor of using EventIpcManager instances.
NMS-5181 increase category group size
Deprecation cleanup, mostly related to the Spring Security upgrade.
NMS-5188 do not DNS-import from localhost in the default configuration
NMS-5195 - fix reparenting code that still referenced old ipaddress in snmpInterface table
Changed ListenerThread to use java.util.concurrent classes to queue
event operations. Removed unnecessary synchronization on event methods.
Renamed inner class to EventListenerExecutor.
Merge remote-tracking branch 'origin/1.10'
NMS-5229 reinstate a couple of options from the old model-import.xsd so old XSDs can be imported
NMS-5229 handle (but ignore) old attributes from 1.6/1.8 import files