diff options
| author | Melissa Zhang <mzhang19096@gmail.com> | 2020-08-07 09:40:06 -0700 |
|---|---|---|
| committer | Melissa Zhang <mzhang19096@gmail.com> | 2020-08-07 09:40:06 -0700 |
| commit | 9886ed681ff18a33f7acab8f83b475ca9ea60bf7 (patch) | |
| tree | 0b69d4b0fbfc52eac07c2e38fdbb34f161a2dc98 /solr-8.3.1 | |
| parent | c94a61aa594f77db4c9b08a5f91c1a7e57d5ff9d (diff) | |
| parent | b02cfed890d9d95a8f45bbc93d688bd3311dd387 (diff) | |
merge with master
Diffstat (limited to 'solr-8.3.1')
| -rw-r--r-- | solr-8.3.1/CHANGES.txt | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | solr-8.3.1/bin/solr | 0 | ||||
| -rw-r--r-- | solr-8.3.1/bin/solr-8983.pid | 2 | ||||
| -rw-r--r-- | solr-8.3.1/server/solr/dash/conf/schema.xml | 3 |
4 files changed, 5 insertions, 2 deletions
diff --git a/solr-8.3.1/CHANGES.txt b/solr-8.3.1/CHANGES.txt index 219888b49..78ee2efc1 100644 --- a/solr-8.3.1/CHANGES.txt +++ b/solr-8.3.1/CHANGES.txt @@ -66,7 +66,7 @@ Upgrade Notes ---------------------- * Users who have written test cases that extend SolrTestCaseJ4 may see NullPointerExceptions if - their tests directly reference both SolrTestCaseJ4.initCoreDataDir and SolrTestCaseJ4.deleteCore(). + their tests directly reference both SolrTestCaseJ4.initCoreDataDir and TestCaseJ4.deleteCore(). This change in behavior is due to a bug fix in deleteCore() to ensure the dataDir is properly reset in tests that call initCore()/deleteCore() multiple times in a given test (class). initCoreDataDir is now deprecated, and users are encouraged to use SolrTestCaseJ4.initAndGetDataDir() in it's place. diff --git a/solr-8.3.1/bin/solr b/solr-8.3.1/bin/solr index 596242fac..596242fac 100644..100755 --- a/solr-8.3.1/bin/solr +++ b/solr-8.3.1/bin/solr diff --git a/solr-8.3.1/bin/solr-8983.pid b/solr-8.3.1/bin/solr-8983.pid index 779eb1af5..1f77d281d 100644 --- a/solr-8.3.1/bin/solr-8983.pid +++ b/solr-8.3.1/bin/solr-8983.pid @@ -1 +1 @@ -17656 +1731 diff --git a/solr-8.3.1/server/solr/dash/conf/schema.xml b/solr-8.3.1/server/solr/dash/conf/schema.xml index c0a4bab07..36e803d83 100644 --- a/solr-8.3.1/server/solr/dash/conf/schema.xml +++ b/solr-8.3.1/server/solr/dash/conf/schema.xml @@ -44,6 +44,9 @@ <field name="text" type="text" indexed="true" stored="false" uninvertible="false" multiValued="true"/> <field name="id" type="string" indexed="true" stored="true" uninvertible="false" required="true"/> <field name="_version_" type="plong" indexed="true" stored="true"/> + <field name="proto" type="string" indexed="true" stored="true" uninvertible="false" /> + <field name="_height" type="pdouble" indexed="true" stored="true" uninvertible="false" docValues="true"/> + <dynamicField name="*_t" type="text" indexed="true" stored="true" uninvertible="false" docValues="false"/> <dynamicField name="*_n" type="pdouble" indexed="true" stored="true" uninvertible="false" docValues="false"/> |
