]> source.dussan.org Git - sonarqube.git/commit
SONAR-6552 fix bad merge
authorSimon Brandhof <simon.brandhof@sonarsource.com>
Thu, 17 Sep 2015 13:36:51 +0000 (15:36 +0200)
committerSimon Brandhof <simon.brandhof@sonarsource.com>
Thu, 17 Sep 2015 13:36:51 +0000 (15:36 +0200)
commit20d34c482023e2fedc45f6917c67d372cbcbda0f
treecaf2b1a793e04cac73698368aabd3f37986d3a80
parent530478f620406f535bd3055f88fab4edaa7da1c5
SONAR-6552 fix bad merge

- fix ruby activerecord adapter
- do not package jtds.jar
pom.xml
server/sonar-web/src/main/webapp/WEB-INF/gems/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/type_converter.rb
sonar-application/assembly.xml
sonar-application/pom.xml
sonar-db/pom.xml