HP has ended its legal action against Oracle over the appointment of former HP chief executive Mark Hurd to Oracle's board of directors.
HP has now issued a statement saying that the companies have resolved the issue, but has refused to divulge any further details.
"HP and Oracle today reaffirmed their long-term strategic partnership and the resolution of litigation regarding Mark Hurd's employment at Oracle," said HP.
"While the terms of the settlement are confidential, Mr Hurd will adhere to his obligations to protect HP's confidential information while fulfilling his responsibilities at Oracle."
Cathie Lesjak, who is acting as interim chief executive at HP, used the announcement to reaffirm the company's relationship with Oracle.
"HP and Oracle have been important partners for more than 20 years, and are committed to working together to provide exceptional products and services to our customers. We look forward to collaborating with Oracle in the future," she said.
Hurd resigned from HP after a sexual harassment probe and alleged discrepancies over his use of expenses.
"As the investigation progressed, I realised there were instances in which I did not live up to the standards and principles of trust, respect and integrity I have espoused at HP and which have guided me throughout my career," Hurd said at the time.
He has been a very visible presence so far at this year's OpenWorld even in San Francisco, taking to the stage yesterday to introduce the latest addition to Oracle's Exadata database appliance.
Cotton seedling freezes to death as Chang'e-4 shuts down for the Moon's 14-day lunar night
Fortnite easily out-earns PUBG, Assassin's Creed Odyssey and Red Dead Redemption 2 in 2018
Meteor showers as a service will be visible for about 100 kilometres in all directions
Saturn's rings only formed in the past 100 million years, suggests analysis of Cassini space probe data
New findings contradict conventional belief that Saturn's rings were formed along with the planet about 4.5 billion years ago