A fairly heated dispute between two leading business intelligence platform providers seems to be done and dusted after Splunk Inc. said it’s acquiring some technology and intellectual property assets from rival Rocana Inc.

The financial terms of the deal were not disclosed.

Publicly held Splunk is fairly well-known as a leader in business intelligence, offering a range of software products that monitor and analyze machine-generated big data. Rocana is less well-known but offers a similar set of tools that apply advanced analytics, big data and visualizations for DevOps, providing more transparency into applications and the data centers that host them.

The two companies famously came to blows two years ago following a row over the superiority of their respective products. Rocana was responsible for kicking things off as it published a blog post that detailed four key differences between its and Splunk’s products. Rocana’s post basically claimed that Splunk was using outdated architecture that was unable to keep up with the rapidly evolving state of information technology. Splunk didn’t take too kindly to that accusation, and even went as far as issuing a cease and desist letter in response to Rocana’s blog post.

Now it seems that Splunk and Rocana have quietly managed to put their differences to one side. Nothing was said about the previous dispute in Monday’s announcement, which also revealed that several of Rocana’s technical staff will be joining its former rival. Instead, it was all smiles and pats on the back.

“Splunk is the most widely adopted machine data and analytics platform in the market today,” said Rocana co-founder and Chief Technology Officer Eric Sammer. “We are thrilled to join the Splunk team and help contribute to its vision of helping customers turn data into answers.” Splunk Chief Product Officer Richard Campione heaped similar praise on Rocana’s team for its work with large-scale data systems.

Splunk said it will use Rocana’s technology and team to build out the machine learning capabilities of its own products, so it’s likely one or two updates to its platform along these lines will arrive in coming months.

Image: Splunk