Changes

Summary

1. merged 2.3 branch (with portals and collections fields) to trunk

Revision 19973 by rnahf: merged 2.3 branch (with portals and collections fields) to trunk
Change Type	Path in Repository	Path in Workspace
	/software/cicore/trunk/cn-buildout/dataone-cn-solr	dataone-cn-solr
	/software/cicore/trunk/cn-buildout/dataone-cn-solr/usr/share/dataone-cn-solr/debian/dataone_search_configs/conf/schema.xml	dataone-cn-solr/usr/share/dataone-cn-solr/debian/dataone_search_configs/conf/schema.xml
	/software/cicore/trunk/cn-buildout/dataone-cn-solr/usr/share/dataone-cn-solr/debian/dataone_search_configs/conf/solrconfig.xml	dataone-cn-solr/usr/share/dataone-cn-solr/debian/dataone_search_configs/conf/solrconfig.xml