...
...
Merge branch 'mvr/PJSM-210' of github.com:OpenNMS/smnnepo into mvr/PJSM-210
Merge remote-tracking branch 'origin/master' into mvr/PJSM-210
Move jmx-sampler implemnetation to own module.
Added brief description of jmx config resource to SAMPLER.adoc
Merge branch 'master' into jira/PJSM-146
Implement SampleProcessor.
Use jmx ParameterName enum instead of collection.api.ServiceParameters.ParameterName and also change some imports to *.jmx.impl (was *.jmx).
PJSM-210: Get rrd storage to work with JMX. Still contains a couple of issues.
PJSM-210: Set resource type to 'if' instead to 'JMX'
PJSM-210: Remove TODOs
Merge remote-tracking branch 'origin/master' into jira/PJSM-210
Merge remote-tracking branch 'origin/jira/PJSM-146' into jira/PJSM-210
PJSM-210: Howto configure OpenNMS to distributed data collect JMX mbeans. First draft.
Fix merge issiues.
PJSM-210: Fix tests by restoring the 'direct:schedulerStart' route.
PJSM-210: Fix tests by using singleton vs singletonList
Merge pull request #7 from OpenNMS/jira/PJSM-210

PJSM-210: Merge branch jira/PJSM210 into jira/PJSM-146
Merge pull request #8 from OpenNMS/jira/PJSM-146

http://issues.opennms.org/browse/PJSM-146