You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@lucene.apache.org by gu...@apache.org on 2019/03/04 17:32:08 UTC

[lucene-solr] 09/10: Merge branch 'moshebla-SOLR-13152' into solr-13131

This is an automated email from the ASF dual-hosted git repository.

gus pushed a commit to branch solr-13131
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit da21eae589e118c10ab8a33a75f8587911c52e9d
Merge: fc0b9fa d7cb6d6
Author: Gus Heck <gu...@apache.org>
AuthorDate: Sun Mar 3 21:06:24 2019 -0500

    Merge branch 'moshebla-SOLR-13152' into solr-13131

 .../cloud/api/collections/CategoryRoutedAlias.java | 52 ++++++++++-----
 .../cloud/api/collections/TimeRoutedAlias.java     |  3 +-
 .../CategoryRoutedAliasUpdateProcessorTest.java    | 73 +++++++++-------------
 .../solrj/request/CollectionAdminRequest.java      | 17 ++---
 .../resources/apispec/collections.Commands.json    |  8 +++
 5 files changed, 84 insertions(+), 69 deletions(-)