category delta is handled in update, current tests pass, some TODO still
Merge remote-tracking branch 'origin/develop' into jira/NMS-6848
Merge remote-tracking branch 'origin/rc/stable/1.14.0' into jira/NMS-6848
not yet working, just doing some moving-things-around
Merge remote-tracking branch 'origin/rc/stable/1.14.0' into jira/NMS-6848
test the simple case -- working test case
NMS-6836: Add null protection in EventLabelComparator
NMS-5059/NMS-5266/NMS-6848 provisioning/category race conditions
add a log so we know what policies are being applied
fix JPA annotations to do what I meant
reformat source
Merge remote-tracking branch 'origin/rc/stable/1.14.0' into jira/NMS-6848
Updated log4j to 2.1-SNAPSHOT to fix problem where it throws an exception
during the static initializer of sun.reflect.misc.Trampoline. Fixes bug
NMS-6784.
[bamboo] Automated branch merge (from 1.12:96db1cb80a1e24088fc33b2d602828efb69762c1)
Merge remote-tracking branch 'origin/rc/stable/1.14.0' into jira/NMS-6848
reinstate update visitation
update .marker-cluster div style
Improving the poller-test command to work better with advanced features.

The PSM requires to know the node's label in order to work with the
${nodelabel} placeholder for web-site monitoring. For this reason, the
implementation of the poller test has been updated to retrieve the
node's information from the database prior executing the poller test.
Merge branch 'jira/NMS-6861' into rc/stable/1.14.0
change %s to {} but leave otherwise alone