I deprecated it in 4.9 and removed it in trunk, so it has slightly different CHANGES entries. Is it messing up merging?
It's in 4.9 - I committed it before Robert cut the branch. Alan Woodward www.flax.co.uk On 18 Jun 2014, at 22:57, Chris Hostetter wrote: > > Alan: somethings not right here with CHANGES.txt... it's in the 4.10 > section on trunk, but it's in the 4.9 section on branch_4x > > (but it was never actually backported to the 4.9 branch i don't think, > correct?) > > > > : Date: Mon, 16 Jun 2014 09:40:39 -0000 > : From: [email protected] > : Reply-To: [email protected] > : To: [email protected] > : Subject: svn commit: r1602830 - in /lucene/dev/branches/branch_4x/solr: > : CHANGES.txt > : core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java > : > : Author: romseygeek > : Date: Mon Jun 16 09:40:39 2014 > : New Revision: 1602830 > : > : URL: http://svn.apache.org/r1602830 > : Log: > : SOLR-6169: Remove broken CoreAdminHandler handleAlias action > : > : Modified: > : lucene/dev/branches/branch_4x/solr/CHANGES.txt > : > lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java > : > : Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt > : URL: > http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1602830&r1=1602829&r2=1602830&view=diff > : > ============================================================================== > : --- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original) > : +++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Mon Jun 16 09:40:39 2014 > : @@ -160,6 +160,9 @@ Other Changes > : * SOLR-6153: ReplicationHandler backup response format should contain > backup name. > : (Varun Thacker via shalin) > : > : +* SOLR-6169: Remove broken handleAlias action in CoreAdminHandler (Alan > : + Woodward) > : + > : Optimizations > : ---------------------- > : > : > : Modified: > lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java > : URL: > http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=1602830&r1=1602829&r2=1602830&view=diff > : > ============================================================================== > : --- > lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java > (original) > : +++ > lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java > Mon Jun 16 09:40:39 2014 > : @@ -629,20 +629,7 @@ public class CoreAdminHandler extends Re > : */ > : @Deprecated > : protected void handleAliasAction(SolrQueryRequest req, SolrQueryResponse > rsp) { > : - SolrParams params = req.getParams(); > : - > : - String name = params.get(CoreAdminParams.OTHER); > : - String cname = params.get(CoreAdminParams.CORE); > : - boolean doPersist = false; > : - if (cname.equals(name)) return; > : - > : - SolrCore core = coreContainer.getCore(cname); > : - if (core != null) { > : - doPersist = coreContainer.isPersistent(); > : - coreContainer.register(name, core, false); > : - // no core.close() since each entry in the cores map should increase > the ref > : - } > : - return; > : + throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "The > ALIAS action is no longer supported"); > : } > : > : > : > : > : > > -Hoss > http://www.lucidworks.com/ > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] >
