Yeah, thanks for catching. I must have screwed up the CHANGES merge I had to do before committing.
- Mark http://about.me/markrmiller On Feb 23, 2014, at 11:07 AM, Steve Rowe <[email protected]> wrote: > Mark, > > In your SOLR-5765 commits, you reverted my CHANGES.txt cleanup for the Admin > UI stuff (editing vs browsing conf dir) - I assume this was inadvertent? > > Steve > > On Feb 22, 2014, at 9:08 PM, [email protected] wrote: > >> Author: markrmiller >> Date: Sun Feb 23 02:08:52 2014 >> New Revision: 1570951 >> >> URL: http://svn.apache.org/r1570951 >> Log: >> SOLR-5765: Update to SLF4J 1.7.6. >> >> Modified: >> lucene/dev/trunk/lucene/ivy-versions.properties >> lucene/dev/trunk/solr/CHANGES.txt >> >> Modified: lucene/dev/trunk/lucene/ivy-versions.properties >> URL: >> http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/ivy-versions.properties?rev=1570951&r1=1570950&r2=1570951&view=diff >> ============================================================================== >> --- lucene/dev/trunk/lucene/ivy-versions.properties (original) >> +++ lucene/dev/trunk/lucene/ivy-versions.properties Sun Feb 23 02:08:52 2014 >> @@ -220,7 +220,7 @@ org.restlet.jee.version = 2.1.1 >> >> /org.simpleframework/simple-xml = 2.7 >> >> -org.slf4j.version = 1.6.6 >> +org.slf4j.version = 1.7.6 >> /org.slf4j/jcl-over-slf4j = ${org.slf4j.version} >> /org.slf4j/jul-to-slf4j = ${org.slf4j.version} >> /org.slf4j/slf4j-api = ${org.slf4j.version} >> >> Modified: lucene/dev/trunk/solr/CHANGES.txt >> URL: >> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1570951&r1=1570950&r2=1570951&view=diff >> ============================================================================== >> --- lucene/dev/trunk/solr/CHANGES.txt (original) >> +++ lucene/dev/trunk/solr/CHANGES.txt Sun Feb 23 02:08:52 2014 >> @@ -47,16 +47,6 @@ Detailed Change List >> New Features >> ---------------------- >> >> -* SOLR-5287: You can edit files in the conf directory from the admin UI. >> - (Erick Erickson, Stefan Matheis) >> - Additional work: >> - - SOLR-5446: Admin UI - Allow changing Schema and Config (steffkes) >> - - SOLR-5458: Admin UI - Remove separated Pages for Config & Schema >> (steffkes) >> - - SOLR-5456: Admin UI - Allow creating new Files (steffkes) >> - - SOLR-5518: Added EditFileRequestHandler to deal with security issues >> around >> - modifying solr configuration files. (Erick Erickson) >> - - SOLR-5539: Admin UI - Remove ability to create/modify files (steffkes) >> - >> >> Other Changes >> ---------------------- >> @@ -86,6 +76,7 @@ New Features >> Bug Fixes >> ---------------------- >> >> + >> Other Changes >> --------------------- >> >> @@ -93,6 +84,8 @@ Other Changes >> use SolrTestCaseJ4.getFile() and getResource() instead; fix >> morphlines/map-reduce >> to not duplicate test resources and fix dependencies among them. >> (Uwe Schindler) >> + >> +* SOLR-5765: Update to SLF4J 1.7.6. (Mark Miller) >> >> >> ================== 4.7.0 ================== >> @@ -133,14 +126,17 @@ New Features >> * SOLR-5320: Added support for tri-level compositeId routing. >> (Anshum Gupta via shalin) >> >> -* SOLR-5287,SOLR-5522,SOLR-5446,SOLR-5456,SOLR-5539,SOLR-5458: >> - Admin UI - Added a new "Files" conf directory browser/file viewer. >> - (steffkes, Erick Erickson) >> +* SOLR-5287: You can edit files in the conf directory from the admin UI >> + (Erick Erickson, Stefan Matheis) >> >> * SOLR-5447, SOLR-5490: Add a QParserPlugin for Lucene's SimpleQueryParser. >> (Jack Conradson via shalin) >> >> -* SOLR-5208: Support for the setting of core.properties key/values at >> create-time on >> +* SOLR-5446: Admin UI - Allow changing Schema and Config (steffkes) >> + >> +* SOLR-5456: Admin UI - Allow creating new Files (steffkes) >> + >> +* SOLR-5208: Support for the setting of core.properties key/values at >> create-time on >> Collections API (Erick Erickson) >> >> * SOLR-5428: SOLR-5690: New 'stats.calcdistinct' parameter in StatsComponent >> returns >> @@ -157,6 +153,9 @@ New Features >> >> * SOLR-5506: Support docValues in CollationField and ICUCollationField. >> (Robert Muir) >> + >> +* SOLR-5518: Added EditFileRequestHandler to deal with security issues >> around modifying >> + solr configuration files. >> >> * SOLR-5023: Add support for deleteInstanceDir to be passed from SolrJ for >> Core >> Unload action. (Lyubov Romanchuk, shalin) >> @@ -382,12 +381,11 @@ Bug Fixes >> * SOLR-5620: ZKStateReader.aliases should be volatile to ensure all threads >> see >> the latest aliases. (Ramkumar Aiyengar via Mark Miller) >> >> -* SOLR-5448: ShowFileRequestHandler treats everything as Directory, when in >> - Cloud-Mode. (Erick Erickson, steffkes) >> - >> Optimizations >> ---------------------- >> >> +* SOLR-5458: Admin UI - Remove separated Pages for Config & Schema >> (steffkes) >> + >> * SOLR-5436: Eliminate the 1500ms wait in overseer loop as well as >> polling the ZK distributed queue. (Noble Paul, Mark Miller) >> >> @@ -436,7 +434,9 @@ Other Changes >> * SOLR-5502: Added a test for tri-level compositeId routing with documents >> having a "/" in a document id. (Anshum Gupta via Mark Miller) >> >> -* SOLR-5533: Improve out of the box support for running Solr on hdfs with >> +* SOLR-5539: Admin UI - Remove ability to create/modify files (steffkes) >> + >> +* SOLR-5533: Improve out of the box support for running Solr on hdfs with >> SolrCloud. (Mark Miller) >> >> * SOLR-5548: Give DistributedSearchTestCase / JettySolrRunner the ability to >> >> > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
