Merge branch 'devel' into issue/52/configs (99efc535) · Commits · ESGF / mirrors / Esgf Docker

solr/Dockerfile

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		## Standard Solr container with setup of ESGF cores built-in
		#####

		FROM solr:5.5
		FROM solr:6.6

		MAINTAINER Earth System Grid Federation <esgf-devel@lists.llnl.gov>