SuccessChanges

Summary

  1. Merge the changes on the 1.5 branch back to trunk.
Revision 20116 by tao:
Merge the changes on the 1.5 branch back to trunk.
Change TypePath in RepositoryPath in Workspace
The file was modified/software/cicore/trunk/cn-buildout/dataone-cn-metacatdataone-cn-metacat
The file was modified/software/cicore/trunk/cn-buildout/dataone-cn-metacat/DEBIAN/controldataone-cn-metacat/DEBIAN/control
The file was modified/software/cicore/trunk/cn-buildout/dataone-cn-metacat/DEBIAN/postinstdataone-cn-metacat/DEBIAN/postinst
The file was modified/software/cicore/trunk/cn-buildout/dataone-cn-metacat/etc/dataone/storage/hazelcast.xmldataone-cn-metacat/etc/dataone/storage/hazelcast.xml
The file was modified/software/cicore/trunk/cn-buildout/dataone-cn-metacat/usr/share/metacat/debian/log4j2.propertiesdataone-cn-metacat/usr/share/metacat/debian/log4j2.properties