sergiogonzalez/liferay-portal — pull request #589 by victormirandabeltran (2013-02-04 09:35:51+00:00)
Title: LPS-13908 Add jndi.name parameter to the initDataSource method to dis…

...allow invalid merges between default and covert properties

Tested cases (manual):

JNDI Datasource to normal datasource
Normal datasource to normal datasource