BGBM BDI Projects / cdmlib.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c872e41 7ae4f42)
Merge remote-tracking branch 'origin/develop' into develop
authorAndreas Müller <a.mueller@bgbm.org>
Thu, 20 Oct 2016 14:04:04 +0000 (16:04 +0200)
committerAndreas Müller <a.mueller@bgbm.org>
Thu, 20 Oct 2016 14:04:04 +0000 (16:04 +0200)
commit4dea3eee1ca44169008674d67f75348e4cce36e5
treec087086fd6ed62a38be19ad06cb67265fcad96cctree | snapshot
parentc872e41836360068b6d04322928e4689297a2ee2commit | diff
parent7ae4f425e2cfc21c3114f1d069d8a9e11153748dcommit | diff
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.java
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.java
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.xml
16 files changed:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Classification.java diff1 | diff2 | blob | history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java diff1 | diff2 | blob | history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java diff1 | diff2 | blob | history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java diff1 | diff2 | blob | history
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmGenericDaoImplTest.java diff1 | diff2 | blob | history
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TypeDesignationDaoHibernateImplTest.java diff1 | diff2 | blob | history
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/statistics/StatisticsDaoHibernateImplTest.java diff1 | diff2 | blob | history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImpl.java diff1 | diff2 | blob | history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java diff1 | diff2 | blob | history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java diff1 | diff2 | blob | history
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/SecurityTest.java diff1 | diff2 | blob | history
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.java diff1 | diff2 | blob | history
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.java diff1 | diff2 | blob | history
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java diff1 | diff2 | blob | history
cdmlib-services/src/test/java/eu/etaxonomy/cdm/datagenerator/TaxonGenerator.java diff1 | diff2 | blob | history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.xml diff1 | diff2 | blob | history