Re: branch_6x does not build

Thanks, looks like the build issue is fixed! Karl On Thu, Jun 29, 2017 at 1:18 PM, Erick Erickson wrote: > Yep, forgot to commit locally before I pushed after resolving merge > conflicts from master. Sorry for the inconvenience. Should be fixed > now. > > On Thu, Jun 29, 2017 at 4:18 AM, Karl W

Re: branch_6x does not build

Yep, forgot to commit locally before I pushed after resolving merge conflicts from master. Sorry for the inconvenience. Should be fixed now. On Thu, Jun 29, 2017 at 4:18 AM, Karl Wright wrote: > I pushed your core code fix along with my change. I have no idea who broke > the tests; the test clas

Re: branch_6x does not build

I pushed your core code fix along with my change. I have no idea who broke the tests; the test class itself hasn't been touched in a while, so I suspect it was broken due to the changes Mr. Erickson committed. Karl On Thu, Jun 29, 2017 at 6:30 AM, Mikhail Khludnev wrote: > Hi, > > I tried to

Re: branch_6x does not build

Hi, I tried to fix $ git diff diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java index c02c748..e60f9dd 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrCore.java +++ b/solr/core/src/java/org/apache/solr/core/Solr

branch_6x does not build

Problem is the following lines: >> acf30220 solr/core/src/java/org/apache/solr/core/SolrCore.java (Erick Erickson2017-04-12 21:55:52 -0700 2835) if (coreContainer != null) { acf30220 solr/core/src/java/org/apache/solr/core/SolrCore.java (Erick Erickson2017