0000000000000000000000000000000000000000 8521ae15ba90e507283c3ee0ef04eef9464a2352 Atlassian Bamboo <bamboo@opennms.org> 1508425059 -0400	checkout: moving from master to master-2015
8521ae15ba90e507283c3ee0ef04eef9464a2352 2ba041c4796dd2dc0383983c1cb29cf5a0cae7b5 Atlassian Bamboo <bamboo@opennms.org> 1508425060 -0400	merge meridian/release-2015.1.8: Fast-forward
2ba041c4796dd2dc0383983c1cb29cf5a0cae7b5 5598c7dc4f4b672f427678be5bfc88dfb5454c29 Atlassian Bamboo <bamboo@opennms.org> 1508425065 -0400	commit: OpenNMS Meridian 2015.1.8
5598c7dc4f4b672f427678be5bfc88dfb5454c29 e255f20e4625fa5f364d5ad8b877738d76811abf Atlassian Bamboo <bamboo@opennms.org> 1508426178 -0400	checkout: moving from master-2015 to develop
e255f20e4625fa5f364d5ad8b877738d76811abf 8521ae15ba90e507283c3ee0ef04eef9464a2352 Atlassian Bamboo <bamboo@opennms.org> 1508426201 -0400	checkout: moving from develop to master-2015
8521ae15ba90e507283c3ee0ef04eef9464a2352 2ba041c4796dd2dc0383983c1cb29cf5a0cae7b5 Atlassian Bamboo <bamboo@opennms.org> 1508426201 -0400	merge meridian/release-2015.1.8: Fast-forward
2ba041c4796dd2dc0383983c1cb29cf5a0cae7b5 51ecc12c4bdfe4c52a4b4575b3c4f3ec92eb56a9 Atlassian Bamboo <bamboo@opennms.org> 1508426206 -0400	commit: OpenNMS Meridian 2015.1.8
51ecc12c4bdfe4c52a4b4575b3c4f3ec92eb56a9 cec1bfaea28d7d10e0479b7f54542745263b4a50 Atlassian Bamboo <bamboo@opennms.org> 1508428166 -0400	checkout: moving from master-2015 to master-2017
cec1bfaea28d7d10e0479b7f54542745263b4a50 0e65c367636c8ff0b32204790d96f978abe084d7 Atlassian Bamboo <bamboo@opennms.org> 1508428166 -0400	merge meridian/release-2017.1.1: Fast-forward
0e65c367636c8ff0b32204790d96f978abe084d7 0e65c367636c8ff0b32204790d96f978abe084d7 Atlassian Bamboo <bamboo@opennms.org> 1508428578 -0400	checkout: moving from master-2017 to master-2017
0e65c367636c8ff0b32204790d96f978abe084d7 a27e155b36a5a07e9a0ba61cbc05a97e3b63fcec Atlassian Bamboo <bamboo@opennms.org> 1508428578 -0400	merge meridian/release-2017.1.1: Fast-forward
a27e155b36a5a07e9a0ba61cbc05a97e3b63fcec 5b94f1920bdfc969e7304766525fd80e95548d2f Atlassian Bamboo <bamboo@opennms.org> 1508428583 -0400	commit: OpenNMS Meridian 2017.1.1
5b94f1920bdfc969e7304766525fd80e95548d2f 51ecc12c4bdfe4c52a4b4575b3c4f3ec92eb56a9 Atlassian Bamboo <bamboo@opennms.org> 1508430693 -0400	checkout: moving from master-2017 to master-2015
51ecc12c4bdfe4c52a4b4575b3c4f3ec92eb56a9 5b94f1920bdfc969e7304766525fd80e95548d2f Atlassian Bamboo <bamboo@opennms.org> 1508430985 -0400	checkout: moving from master-2015 to master-2017
5b94f1920bdfc969e7304766525fd80e95548d2f 08b5274af37e83b3ae1ce2ff5e37bccb0f944bd7 Atlassian Bamboo <bamboo@opennms.org> 1508431216 -0400	commit (merge): Merge remote-tracking branch 'meridian/master-2016' into master-2017
08b5274af37e83b3ae1ce2ff5e37bccb0f944bd7 cec1bfaea28d7d10e0479b7f54542745263b4a50 Atlassian Bamboo <bamboo@opennms.org> 1508431232 -0400	checkout: moving from master-2017 to meridian-master
cec1bfaea28d7d10e0479b7f54542745263b4a50 08b5274af37e83b3ae1ce2ff5e37bccb0f944bd7 Atlassian Bamboo <bamboo@opennms.org> 1508431242 -0400	merge meridian/master-2017: Fast-forward
08b5274af37e83b3ae1ce2ff5e37bccb0f944bd7 391dec8ac624de691276d2af7d14d8c2b2483c54 Atlassian Bamboo <bamboo@opennms.org> 1508431359 -0400	checkout: moving from meridian-master to master-21
391dec8ac624de691276d2af7d14d8c2b2483c54 35e975aa46da251da684f1f68dd39d23b13f3470 Atlassian Bamboo <bamboo@opennms.org> 1508431360 -0400	merge horizon/release-21.0.0: Fast-forward
35e975aa46da251da684f1f68dd39d23b13f3470 a8af07c752fa1818c3e1d464308942feab89de80 Atlassian Bamboo <bamboo@opennms.org> 1508431367 -0400	commit: OpenNMS Horizon 21.0.0
a8af07c752fa1818c3e1d464308942feab89de80 391dec8ac624de691276d2af7d14d8c2b2483c54 Atlassian Bamboo <bamboo@opennms.org> 1508439028 -0400	checkout: moving from master-21 to horizon-master
391dec8ac624de691276d2af7d14d8c2b2483c54 a8af07c752fa1818c3e1d464308942feab89de80 Atlassian Bamboo <bamboo@opennms.org> 1508439040 -0400	checkout: moving from horizon-master to master-21
a8af07c752fa1818c3e1d464308942feab89de80 391dec8ac624de691276d2af7d14d8c2b2483c54 Atlassian Bamboo <bamboo@opennms.org> 1508439052 -0400	checkout: moving from master-21 to horizon-master
391dec8ac624de691276d2af7d14d8c2b2483c54 a8af07c752fa1818c3e1d464308942feab89de80 Atlassian Bamboo <bamboo@opennms.org> 1508439061 -0400	merge horizon/master-21: Fast-forward
a8af07c752fa1818c3e1d464308942feab89de80 a8af07c752fa1818c3e1d464308942feab89de80 Atlassian Bamboo <bamboo@opennms.org> 1510850018 -0500	checkout: moving from horizon-master to master-21
a8af07c752fa1818c3e1d464308942feab89de80 b6126f375c59b50f55d142ca6db9c806aad05485 Atlassian Bamboo <bamboo@opennms.org> 1510850018 -0500	merge horizon/release-21.0.1: Fast-forward
b6126f375c59b50f55d142ca6db9c806aad05485 b6126f375c59b50f55d142ca6db9c806aad05485 Atlassian Bamboo <bamboo@opennms.org> 1510850079 -0500	checkout: moving from master-21 to master-21
b6126f375c59b50f55d142ca6db9c806aad05485 6e58f7f4c1cf023cda147236ce35146b6033c5b0 Atlassian Bamboo <bamboo@opennms.org> 1510850079 -0500	merge horizon/release-21.0.1: Fast-forward
6e58f7f4c1cf023cda147236ce35146b6033c5b0 c24d1416790d24c0c02a8ce1a3bf1af2b1f79a9a Atlassian Bamboo <bamboo@opennms.org> 1510850085 -0500	commit: OpenNMS Horizon 21.0.1
c24d1416790d24c0c02a8ce1a3bf1af2b1f79a9a bd90a4dfebba9702d5f6475cec3f2a1fea8d4cb4 Atlassian Bamboo <bamboo@opennms.org> 1510860037 -0500	checkout: moving from master-21 to master-2016
bd90a4dfebba9702d5f6475cec3f2a1fea8d4cb4 771717440e7f1fcce4a15dc846e559572ecca1a8 Atlassian Bamboo <bamboo@opennms.org> 1510860037 -0500	merge meridian/release-2016.1.9: Fast-forward
771717440e7f1fcce4a15dc846e559572ecca1a8 94a3bb028a9a420b793c7346a48955fa3c5c656c Atlassian Bamboo <bamboo@opennms.org> 1510860044 -0500	commit: OpenNMS Meridian 2016.1.9
94a3bb028a9a420b793c7346a48955fa3c5c656c 08b5274af37e83b3ae1ce2ff5e37bccb0f944bd7 Atlassian Bamboo <bamboo@opennms.org> 1510862250 -0500	checkout: moving from master-2016 to master-2017
08b5274af37e83b3ae1ce2ff5e37bccb0f944bd7 1ac8e89b036bca7ae92dce30148e610ad703eef4 Atlassian Bamboo <bamboo@opennms.org> 1510862251 -0500	merge meridian/release-2017.1.2: Fast-forward
1ac8e89b036bca7ae92dce30148e610ad703eef4 1a2fb7971f8eaba1251cd1dc0e739319b40e0a2b Atlassian Bamboo <bamboo@opennms.org> 1510862258 -0500	commit: OpenNMS Meridian 2017.1.2
1a2fb7971f8eaba1251cd1dc0e739319b40e0a2b c24d1416790d24c0c02a8ce1a3bf1af2b1f79a9a Atlassian Bamboo <bamboo@opennms.org> 1510863835 -0500	checkout: moving from master-2017 to master-21
c24d1416790d24c0c02a8ce1a3bf1af2b1f79a9a 69ddce1f4f572be79f31f8056018f7fbb12527de Atlassian Bamboo <bamboo@opennms.org> 1510863859 -0500	rebase: checkout horizon/master-21
69ddce1f4f572be79f31f8056018f7fbb12527de 1bf6f213c17357266f47262da111f5443303cd9a Atlassian Bamboo <bamboo@opennms.org> 1510863859 -0500	rebase: NMS-9672: Fixed XSS vulnerability in instrumentationLogReader.jsp
1bf6f213c17357266f47262da111f5443303cd9a a92063a847f1e41cc8cec3e019386a708dc8ac57 Atlassian Bamboo <bamboo@opennms.org> 1510863859 -0500	rebase: Telemetry: Add system tests for opennms/minion
a92063a847f1e41cc8cec3e019386a708dc8ac57 144d5e69d3492c023ac88e0d0acfdc3ae5771262 Atlassian Bamboo <bamboo@opennms.org> 1510863859 -0500	rebase: NMS-9645: Also sanitize for xml attribute characters
144d5e69d3492c023ac88e0d0acfdc3ae5771262 42d71327c1e4778dc818ab51081cb39bcbb5aa8c Atlassian Bamboo <bamboo@opennms.org> 1510863859 -0500	rebase: NMS-9694: Fix typo in typeof comparison to fix FIQL search encoding
42d71327c1e4778dc818ab51081cb39bcbb5aa8c fc99cc32a0321e98aa88de8687d1d4d423fef387 Atlassian Bamboo <bamboo@opennms.org> 1510863859 -0500	rebase: Fix NMS-9700: Typo in regional status geo map: Unacknowledges (for unacknolwedged)
fc99cc32a0321e98aa88de8687d1d4d423fef387 8de8465b81447a5e7a2b8414d98ed21daa4028b1 Atlassian Bamboo <bamboo@opennms.org> 1510863859 -0500	rebase: Fix NMS-9701: Typo: "not elegible" for SNMP primary N enumeration
8de8465b81447a5e7a2b8414d98ed21daa4028b1 8824a1f7e7a0f1435452b49c3e8dc5c6a3f90c81 Atlassian Bamboo <bamboo@opennms.org> 1510863859 -0500	rebase: 21.0.0 -> 21.0.1-SNAPSHOT
8824a1f7e7a0f1435452b49c3e8dc5c6a3f90c81 c4ba04234e735b1d5d68e134f74067178932cbc1 Atlassian Bamboo <bamboo@opennms.org> 1510863859 -0500	rebase: Fix for Bug NMS-9524
c4ba04234e735b1d5d68e134f74067178932cbc1 87690c2c53c98d8f973420c6fb42db897f8f2878 Atlassian Bamboo <bamboo@opennms.org> 1510863859 -0500	rebase: NMS-9708: Process the @Event related annotations on the Telemetryd bean.
87690c2c53c98d8f973420c6fb42db897f8f2878 a18e945ce0b3d872375bcb63038d9b8c63c11a01 Atlassian Bamboo <bamboo@opennms.org> 1510863859 -0500	rebase: NMS-9492: Pass rescanExisting attribute of requisition-def tags in provisiond.xml to CoreImportActivities - i.e. support DNS import with rescanExisting=false
a18e945ce0b3d872375bcb63038d9b8c63c11a01 1bddc51f0ec88b72bde68bad9ed17066cd258efe Atlassian Bamboo <bamboo@opennms.org> 1510863859 -0500	rebase: NMS-9704: Manually refresh all theme related bundles
1bddc51f0ec88b72bde68bad9ed17066cd258efe c24d1416790d24c0c02a8ce1a3bf1af2b1f79a9a Atlassian Bamboo <bamboo@opennms.org> 1510863864 -0500	rebase: aborting
c24d1416790d24c0c02a8ce1a3bf1af2b1f79a9a 894f3e02f38b4c770c457084168f11fe3ca73965 Atlassian Bamboo <bamboo@opennms.org> 1510863927 -0500	commit (merge): Merge remote-tracking branch 'horizon/master-21' into master-21
894f3e02f38b4c770c457084168f11fe3ca73965 94a3bb028a9a420b793c7346a48955fa3c5c656c Atlassian Bamboo <bamboo@opennms.org> 1510864025 -0500	checkout: moving from master-21 to master-2016
94a3bb028a9a420b793c7346a48955fa3c5c656c 94a3bb028a9a420b793c7346a48955fa3c5c656c Atlassian Bamboo <bamboo@opennms.org> 1510864103 -0500	checkout: moving from master-2016 to master-2016
94a3bb028a9a420b793c7346a48955fa3c5c656c 1a2fb7971f8eaba1251cd1dc0e739319b40e0a2b Atlassian Bamboo <bamboo@opennms.org> 1510864273 -0500	checkout: moving from master-2016 to master-2017
1a2fb7971f8eaba1251cd1dc0e739319b40e0a2b 894f3e02f38b4c770c457084168f11fe3ca73965 Atlassian Bamboo <bamboo@opennms.org> 1510865770 -0500	checkout: moving from master-2017 to master-21
894f3e02f38b4c770c457084168f11fe3ca73965 5410483586c6e39b3d118bcf7fea09d8c756dc9e Atlassian Bamboo <bamboo@opennms.org> 1510865794 -0500	commit: fix rendering issue in docs
5410483586c6e39b3d118bcf7fea09d8c756dc9e 087784169e7c20f10f02ff3811e0eb7715fa395b Atlassian Bamboo <bamboo@opennms.org> 1510868437 -0500	commit: attempt to fix link formatting
087784169e7c20f10f02ff3811e0eb7715fa395b 7270ca400b15e75dd66b8af70e4ba890200fe696 Atlassian Bamboo <bamboo@opennms.org> 1510868567 -0500	commit (amend): attempt to fix link formatting
7270ca400b15e75dd66b8af70e4ba890200fe696 7270ca400b15e75dd66b8af70e4ba890200fe696 Atlassian Bamboo <bamboo@opennms.org> 1513872753 -0500	checkout: moving from master-21 to master-21
7270ca400b15e75dd66b8af70e4ba890200fe696 6bca4a7fde18787821e3112a3e6c60e7fbd0982a Atlassian Bamboo <bamboo@opennms.org> 1513872753 -0500	merge horizon/release-21.0.2: Fast-forward
6bca4a7fde18787821e3112a3e6c60e7fbd0982a 94ac68b09e3c377303aa5b64d7a02d9d1bc61561 Atlassian Bamboo <bamboo@opennms.org> 1513872759 -0500	commit: OpenNMS Horizon 21.0.2
94ac68b09e3c377303aa5b64d7a02d9d1bc61561 94a3bb028a9a420b793c7346a48955fa3c5c656c Atlassian Bamboo <bamboo@opennms.org> 1513877120 -0500	checkout: moving from master-21 to master-2016
94a3bb028a9a420b793c7346a48955fa3c5c656c 8ca4525f1a8e8fdbb59a575d692dba6bf1c5e35d Atlassian Bamboo <bamboo@opennms.org> 1513877120 -0500	merge meridian/release-2016.1.10: Fast-forward
8ca4525f1a8e8fdbb59a575d692dba6bf1c5e35d f0ef4de7dfe8f41355d431ffba077f8417aeca60 Atlassian Bamboo <bamboo@opennms.org> 1513877127 -0500	commit: OpenNMS Meridian 2016.1.10
f0ef4de7dfe8f41355d431ffba077f8417aeca60 1a2fb7971f8eaba1251cd1dc0e739319b40e0a2b Atlassian Bamboo <bamboo@opennms.org> 1513881669 -0500	checkout: moving from master-2016 to master-2017
1a2fb7971f8eaba1251cd1dc0e739319b40e0a2b 683b5d11f8a530865953b91580f65425bb1c0e16 Atlassian Bamboo <bamboo@opennms.org> 1513881669 -0500	merge meridian/release-2017.1.3: Fast-forward
683b5d11f8a530865953b91580f65425bb1c0e16 66899d3e02246cdabfde68aa238c65e8159d9dd4 Atlassian Bamboo <bamboo@opennms.org> 1513881675 -0500	commit: OpenNMS Meridian 2017.1.3
66899d3e02246cdabfde68aa238c65e8159d9dd4 94ac68b09e3c377303aa5b64d7a02d9d1bc61561 Atlassian Bamboo <bamboo@opennms.org> 1513886733 -0500	checkout: moving from master-2017 to master-21
94ac68b09e3c377303aa5b64d7a02d9d1bc61561 a8af07c752fa1818c3e1d464308942feab89de80 Atlassian Bamboo <bamboo@opennms.org> 1513886786 -0500	checkout: moving from master-21 to horizon-master
a8af07c752fa1818c3e1d464308942feab89de80 7270ca400b15e75dd66b8af70e4ba890200fe696 Atlassian Bamboo <bamboo@opennms.org> 1513886790 -0500	pull: Fast-forward
7270ca400b15e75dd66b8af70e4ba890200fe696 94ac68b09e3c377303aa5b64d7a02d9d1bc61561 Atlassian Bamboo <bamboo@opennms.org> 1513886797 -0500	merge horizon/master-21: Fast-forward
94ac68b09e3c377303aa5b64d7a02d9d1bc61561 f0ef4de7dfe8f41355d431ffba077f8417aeca60 Atlassian Bamboo <bamboo@opennms.org> 1513887758 -0500	checkout: moving from horizon-master to master-2016
f0ef4de7dfe8f41355d431ffba077f8417aeca60 66899d3e02246cdabfde68aa238c65e8159d9dd4 Atlassian Bamboo <bamboo@opennms.org> 1513887766 -0500	checkout: moving from master-2016 to master-2017
66899d3e02246cdabfde68aa238c65e8159d9dd4 f0ef4de7dfe8f41355d431ffba077f8417aeca60 Atlassian Bamboo <bamboo@opennms.org> 1513887853 -0500	checkout: moving from master-2017 to master-2016
f0ef4de7dfe8f41355d431ffba077f8417aeca60 66899d3e02246cdabfde68aa238c65e8159d9dd4 Atlassian Bamboo <bamboo@opennms.org> 1513887955 -0500	checkout: moving from master-2016 to master-2017
66899d3e02246cdabfde68aa238c65e8159d9dd4 66899d3e02246cdabfde68aa238c65e8159d9dd4 Atlassian Bamboo <bamboo@opennms.org> 1513888017 -0500	checkout: moving from master-2017 to master-2017
66899d3e02246cdabfde68aa238c65e8159d9dd4 f0ef4de7dfe8f41355d431ffba077f8417aeca60 Atlassian Bamboo <bamboo@opennms.org> 1513888078 -0500	checkout: moving from master-2017 to master-2016
f0ef4de7dfe8f41355d431ffba077f8417aeca60 66899d3e02246cdabfde68aa238c65e8159d9dd4 Atlassian Bamboo <bamboo@opennms.org> 1513888109 -0500	checkout: moving from master-2016 to master-2017
66899d3e02246cdabfde68aa238c65e8159d9dd4 5fa907ca5ef86f363ee2fa7ba06d1ee01d64cf7d Atlassian Bamboo <bamboo@opennms.org> 1513888310 -0500	commit (merge): Merge remote-tracking branch 'meridian/master-2016' into master-2017
5fa907ca5ef86f363ee2fa7ba06d1ee01d64cf7d 94ac68b09e3c377303aa5b64d7a02d9d1bc61561 Atlassian Bamboo <bamboo@opennms.org> 1516300583 -0500	checkout: moving from master-2017 to master-21
94ac68b09e3c377303aa5b64d7a02d9d1bc61561 5e627e736d93c19724dffcbde1bdc8aa21440d2a Atlassian Bamboo <bamboo@opennms.org> 1516300583 -0500	merge horizon/release-21.0.3: Fast-forward
5e627e736d93c19724dffcbde1bdc8aa21440d2a c0ef4340875188d02cc76a670241d8b88f83b32a Atlassian Bamboo <bamboo@opennms.org> 1516300597 -0500	commit: OpenNMS Horizon 21.0.3
c0ef4340875188d02cc76a670241d8b88f83b32a 94ac68b09e3c377303aa5b64d7a02d9d1bc61561 Atlassian Bamboo <bamboo@opennms.org> 1516300649 -0500	reset: moving to horizon/master-21
94ac68b09e3c377303aa5b64d7a02d9d1bc61561 94ac68b09e3c377303aa5b64d7a02d9d1bc61561 Atlassian Bamboo <bamboo@opennms.org> 1516300740 -0500	checkout: moving from master-21 to master-21
94ac68b09e3c377303aa5b64d7a02d9d1bc61561 5e627e736d93c19724dffcbde1bdc8aa21440d2a Atlassian Bamboo <bamboo@opennms.org> 1516300741 -0500	merge horizon/release-21.0.3: Fast-forward
5e627e736d93c19724dffcbde1bdc8aa21440d2a ebe222fabda060026623f78f7cd37195a599f469 Atlassian Bamboo <bamboo@opennms.org> 1516300746 -0500	commit: OpenNMS Horizon 21.0.3
