Kevin Risden
c4a8a77d23
SOLR-14209: Upgrade JQuery to 3.4.1
...
* JQuery 2.1.3 to 3.4.1
* jstree 1.0-rc1 to v3.3.8
Closes #1209
Signed-off-by: Kevin Risden <krisden@apache.org>
2020-02-08 11:57:56 -06:00
Robert Muir
f41eabdc5f
LUCENE-8279: fix javadocs wrong header levels and accessibility issues
...
Java 13 adds a new doclint check under "accessibility" that the html
header nesting level isn't crazy.
Many are incorrect because the html4-style javadocs had horrible
font-sizes, so developers used the wrong header level to work around it.
This is no issue in trunk (always html5).
Java recommends against using such structured tags at all in javadocs,
but that is a more involved change: this just "shifts" header levels
in documents to be correct.
2020-02-08 10:00:00 -05:00
Shalin Shekhar Mangar
f5c132be6d
SOLR-14248: Improve ClusterStateMockUtil and make its methods public
2020-02-08 11:59:27 +05:30
Nicholas Knize
206a70e7b7
LUCENE-9149: Increase data dimension limit in BKD
2020-02-07 16:08:14 -06:00
Andrzej Bialecki
9a19093586
SOLR-14245: Validate Replica / ReplicaInfo on creation.
2020-02-07 17:56:39 +01:00
Robert Muir
0d339043e3
LUCENE-9209: fix javadocs to be html5, enable doclint html checks, remove jtidy
...
Current javadocs declare an HTML5 doctype: !DOCTYPE HTML. Some HTML5
features are used, but unfortunately also some constructs that do not
exist in HTML5 are used as well.
Because of this, we have no checking of any html syntax. jtidy is
disabled because it works with html4. doclint is disabled because it
works with html5. our docs are neither.
javadoc "doclint" feature can efficiently check that the html isn't
crazy. we just have to fix really ancient removed/deprecated stuff
(such as use of tt tag).
This enables the html checking in both ant and gradle. The docs are
fixed via straightforward transformations.
One exception is table cellpadding, for this some helper CSS classes
were added to make the transition easier (since it must apply padding
to inner th/td, not possible inline). I added TODOs, we should clean
this up. Most problems look like they may have been generated from a
GUI or similar and not a human.
2020-02-06 22:30:52 -05:00
Robert Muir
63be99bf12
SOLR-14118: default embedded zookeeper port to localhost
2020-02-05 21:33:37 -05:00
Marcus
bc5f837344
SOLR-14147 change the Security manager to default to true. ( #1141 )
...
* change the Security manager to default.
* update the ref-guide.
* uncomment init scripts update changes.
* changed the ref guide and re-commented file.
* remove added comment.
* modified shell script.
* removed comment in windows file.
Signed-off-by: marcussorealheis <marcuseagan@gmail.com>
* bashism and fix windows
* remove space
Signed-off-by: marcussorealheis <marcuseagan@gmail.com>
2020-02-05 19:17:55 -05:00
Houston Putman
80ed8c281b
SOLR-13887: Use the default idleTimeout instead of 0 for HTTP2 ( #991 )
2020-02-05 11:15:37 -08:00
Chris Hostetter
c5d0391df9
SOLR-14241: New delete() Stream Decorator
2020-02-05 10:49:24 -07:00
Adrien Grand
fe349ddcf2
SOLR-14242: HdfsDirectory#createTempOutput. ( #1240 )
2020-02-05 16:38:53 +01:00
Adrien Grand
2d8428ec2e
SOLR-14238: Fix HdfsDirectory to no longer overwrite existing files. ( #1237 )
2020-02-04 19:35:15 +01:00
Tomas Fernandez Lobbe
bb90569f1d
SOLR-14219: Revert changes in OverseerSolrRespose and move serialization ( #1227 )
...
SOLR-14095 Introduced an issue for rolling restarts (Incompatible Java serialization). This change fixes the compatibility issue while keeping the functionality in SOLR-14095
2020-02-04 10:26:57 -08:00
Munendra S N
c91dd9d0e4
SOLR-14090: fix delete-copy-field when source is dynamic field
2020-02-04 21:33:31 +05:30
Munendra S N
4eff9c9b5e
SOLR-10567: add support for DateRangeField in JSON facet range
2020-02-04 21:26:40 +05:30
Erick Erickson
b0bb299dc4
LUCENE-9134: Port ant-regenerate tasks to Gradle build ( #1230 )
...
LUCENE-9134: Port ant-regenerate tasks to Gradle build (Solr javacc)
2020-02-04 09:16:38 -05:00
Erick Erickson
d3ac1329a3
LUCENE-8656: Deprecations in FuzzyQuery ( #1229 )
...
LUCENE-8656: Deprecations in FuzzyQuery
Closes #1229
2020-02-03 08:52:33 -05:00
Mikhail Khludnev
d8bc9bcfcf
SOLR-12325: uniqueBlock(\{!v=foo:bar})
2020-02-02 15:15:35 +03:00
Jan Høydahl
16b8d50284
SOLR-14221: Upgrade restlet to version 2.4.0 ( #1211 )
2020-02-02 11:35:14 +01:00
Munendra S N
a2c53dad72
fix typo in schema-api documentation
2020-02-01 10:21:52 +05:30
Joel Bernstein
db78f6cd00
SOLR-14139: Support backtick phrase queries in Streaming Expressions
2020-01-31 11:54:14 -05:00
Jason Gerlowski
719b38c8d8
SOLR-13892: Add 'top-level' docValues Join implementation ( #1171 )
2020-01-31 11:21:01 -05:00
Chris Hostetter
517438e356
New /stream test cases showing authn+authz edge cases in cloud mode
...
This triggers various places in the Streaming Expressions code that use background threads
to confirm that the expected credentails (or lack of) are propogarded along.
Test currently has comments + workarounds for 2 known client issues:
- SOLR-14226: SolrStream reports AuthN/AuthZ failures (401|403) as IOException w/o details
- SOLR-14222: CloudSolrClient converts (update) 403 error to 500 error
2020-01-30 10:01:03 -07:00
Adrien Grand
7941d109bd
SOLR-13897: Fix precommit.
2020-01-28 20:11:47 +01:00
Cassandra Targett
1a14c67426
Ref Guide: Remove outdated or invalid links to Solr Wiki; update URL of those that remain
2020-01-27 16:38:31 -06:00
Cassandra Targett
b2f51f1941
Ref Guide: fix undefined substitution error caused by formatting of variables in paths
2020-01-27 16:38:30 -06:00
Robert Muir
975df9ddd3
LUCENE-9182: add apache license headers to all .gradle files and enforce in rat task
2020-01-27 12:05:34 -05:00
Robert Muir
8e357b167b
LUCENE-9180: dos2unix files that don't need dos line endings
2020-01-27 11:29:59 -05:00
Robert Muir
5f964eeef2
SOLR-14217: tests respect tests.workDir correctly (prevent SSD destruction)
2020-01-27 06:07:48 -05:00
Shalin Shekhar Mangar
776631254f
SOLR-13897: Fix unsafe publication of Terms object in ZkShardTerms that can cause visibility issues and race conditions under contention
2020-01-27 12:08:20 +05:30
Uwe Schindler
fd49c903b8
SOLR-14189: Add changes entry
2020-01-26 12:06:13 +01:00
andywebb1975
efd0e8f3e8
SOLR-14189 switch from String.trim() to StringUtils.isBlank() ( #1172 )
2020-01-26 12:03:39 +01:00
Gus Heck
127ce3e360
SOLR-13749 adjust changes to reflect backport to 8.5
2020-01-25 00:53:27 -05:00
Cassandra Targett
ba77a5f2eb
SOLR-14214: Clean up client lists and references
2020-01-24 15:46:30 -06:00
Mike
eaa3dbe440
SOLR-14162 TestInjection can leak Timer objects ( #1137 )
2020-01-24 14:04:22 -06:00
Mikhail Khludnev
16e537db7e
SOLR-12045: Know how Analytic Component deployment.
2020-01-23 23:22:32 +03:00
Cassandra Targett
64cb1c8fe8
SOLR-12930: Create developer docs directories in source repo ( #1164 )
2020-01-23 14:00:23 -06:00
Kevin Risden
b150202c85
SOLR-11554: Support handling OPTIONS request for Hadoop authentication filter
...
Signed-off-by: Kevin Risden <krisden@apache.org>
2020-01-23 13:45:54 -05:00
Andrzej Bialecki
434f90265b
SOLR-14211: Fix a bug introduced in SOLR-14192.
2020-01-23 19:33:12 +01:00
Anshum Gupta
3c0146196a
SOLR-14206: Annotate HttpSolrCall as thread-safe ( #1203 )
...
* SOLR-14206: Annotate HttpSolrCall and V2HttpCall as thread-safe
2020-01-23 08:37:03 -08:00
Nick Vercammen
60a2926546
SOLR-14205 Do not fail when given timeout to connectionImpl.isValid() = 0
...
Closes #1204
Signed-off-by: Kevin Risden <krisden@apache.org>
2020-01-23 10:12:43 -05:00
Kevin Risden
9b6fc1b9fc
SOLR-14132: Upgrade Angular JS 1.3.8 to 1.7.9
...
* Upgrade Angular JS 1.3.8 to 1.7.9
* Upgrade Angular Chosen v1.3.0 and Chosen to v1.8.7
* Remove older jquery 1.7.2 version
* Remove non minified Angular JS files
Closes #1196
Signed-off-by: Kevin Risden <krisden@apache.org>
2020-01-23 09:20:12 -05:00
Jan Høydahl
e744f7977e
SOLR-14196: AdminUI login not working for JWTAuth when blockUnknown=false ( #1190 )
2020-01-23 14:51:36 +01:00
Shalin Shekhar Mangar
84270dc6cf
SOLR-14172: Collection metadata remains in zookeeper if too many shards are requested.
...
This also fixes a bug where an inability to assign a node based on existing autoscaling policy resulted in a server error instead of a bad request.
This closes #1152 .
2020-01-23 15:19:53 +05:30
Shalin Shekhar Mangar
04193d5252
SOLR-14207: Fix logging statements with less or more arguments than placeholders
2020-01-23 14:00:08 +05:30
Houston Putman
c53cbb12f4
SOLR-11746: Adding CHANGES.txt entry
2020-01-22 23:44:25 -05:00
Houston Putman
ffba54a827
SOLR-11746: Adding existence queries for PointFields
...
* DocValuesFieldExistsQuery and NormsFieldExistsQuery are used for existence queries when possible.
* Added documentation on the difference between field:* and field:[* TO *]
2020-01-22 18:00:55 -05:00
Chris Hostetter
6b3e7feba1
SOLR-14159: Eliminate some 'spin loops' in tests that may be contributing factors to odd test failures
2020-01-22 14:44:56 -07:00
Jan Høydahl
75c64089a1
SOLR-14198: Nullpointer exception in AuditEvent with AuthorizationContext ( #1192 )
2020-01-22 21:39:43 +01:00
David Smiley
f1db918e20
SOLR-14040: restore legacy Collection auto-creation
2020-01-22 15:26:37 -05:00
Chris Hostetter
95dfddc7d4
SOLR-12859: Fixed DocExpirationUpdateProcessorFactory to work with BasicAuth and other auth plugins that delegate to PKI for server initiated node-to-node communication.
2020-01-22 09:32:25 -07:00
Joel Bernstein
25ba52d1a0
SOLR-14130: Update CHANGES.txt
2020-01-22 09:52:20 -05:00
Ishan Chattopadhyaya
cc9c494a34
Synchronizing 8.4.1 changes
2020-01-22 11:31:12 +05:30
Ishan Chattopadhyaya
f6ca662f33
Synchronizing 8.4.1 changes
2020-01-22 11:21:53 +05:30
Christine Poerschke
1af171e47f
SOLR-13965: Factor out public static StreamHandler.addExpressiblePlugins method.
2020-01-21 18:33:26 +00:00
David Smiley
ab924fd4ea
SOLR-14040: shareSchema support for SolrCloud
...
* Use Caffeine impl and weak values (to the schema). Previously the cache never evicted!
* now populating the configSet name from ZK into CloudDescriptor when CloudDescriptor is loaded
* actual schema name needs to be deterministic now; fallback from non-existent managed-schema to schema.xml will thwart this cache
* a test conf/core.properties wasn't actually used and became a problem in it's weird location after I refactored some logic
2020-01-21 13:18:37 -05:00
Andrzej Bialecki
6244b7150e
SOLR-14192: Race condition between SchemaManager and ZkIndexSchemaReader.
2020-01-20 17:11:47 +01:00
Dawid Weiss
351b30489c
LUCENE-9077: Enable javac linting as in ant. TONS of warnings are currently printed.
2020-01-20 10:10:48 +01:00
Mike
338d386ae0
LUCENE-9145 First pass addressing static analysis ( #1181 )
...
Fixed a bunch of the smaller warnings found by error-prone compiler
plugin, while ignoring a lot of the bigger ones.
2020-01-17 13:30:39 -06:00
Chris Hostetter
5f2d7c4855
SOLR-14184: Internal 'test' variable DirectUpdateHandler2.commitOnClose has been removed and replaced with TestInjection.skipIndexWriterCommitOnClose
2020-01-16 11:47:06 -07:00
Christine Poerschke
94ee211366
Fix 'Restar[t]ing' typo in RecoveryStrategy INFO log message.
2020-01-16 18:13:47 +00:00
Christine Poerschke
f04a5177e6
Update copyright year(s) in lucene/NOTICE.txt and solr/NOTICE.txt files.
2020-01-16 18:13:47 +00:00
Joel Bernstein
35d8e3de6d
SOLR-14130: Continue to improve log parsing logic
2020-01-16 11:36:11 -05:00
Cassandra Targett
2adecb1d6d
Ref Guide: make single shard requirement for TaggerRequestHandler slightly more prominent and descriptive
2020-01-16 09:18:31 -06:00
Jason Gerlowski
424ace6f5d
SOLR-14186: Enforce CRLF in Windows files with .gitattributes ( #1163 )
2020-01-16 08:30:39 -05:00
Alan Woodward
7ea7ed72ac
LUCENE-9068: Solr query handling code catches FuzzyTermsException
2020-01-16 09:52:18 +00:00
Andrzej Bialecki
543505470c
SOLR-14128: Tentative fix: put replicas on other nodes than overseer, wait for
...
all replicas to complete the reload.
2020-01-16 10:42:26 +01:00
Joel Bernstein
4c473db99d
SOLR-14130: Add parsing instructions for different types of query records
2020-01-15 15:01:28 -05:00
Dawid Weiss
c51a4a030b
Merge remote-tracking branch 'origin/master' into gradle-master
2020-01-15 13:00:02 +01:00
Dawid Weiss
0231b93731
Revert "SOLR-12490: corrected link."
...
This reverts commit 5cb5151421
.
2020-01-15 12:59:35 +01:00
Dawid Weiss
5cb5151421
SOLR-12490: corrected link.
2020-01-15 12:57:18 +01:00
Mikhail Khludnev
0e4abf7179
SOLR-12490: reverting ref-guide-fix.
2020-01-15 13:08:05 +03:00
Dawid Weiss
08d2c2d0df
Merge remote-tracking branch 'origin/master' into gradle-master
2020-01-15 09:54:45 +01:00
Mikhail Khludnev
5cf1ffef32
SOLR-12490: Describe json.queries in the ref guide.
...
Link it from many pages.
Fix a few errors by the way.
2020-01-15 09:04:54 +03:00
Dawid Weiss
2992e7dd86
Merge remote-tracking branch 'origin/master' into gradle-master
2020-01-13 19:11:04 +01:00
Dawid Weiss
2cda4184c9
Fix javadoc.
2020-01-13 19:09:56 +01:00
Dawid Weiss
3008dd9526
Merge remote-tracking branch 'origin/master' into gradle-master
2020-01-13 17:55:53 +01:00
Jason Gerlowski
58b3c1f068
SOLR-14186: Re-add CRLF line endings to solr.cmd ( #1162 )
2020-01-13 10:40:43 -05:00
Jason Gerlowski
5377742a62
SOLR-13985: Bind to localhost interface by default ( #1154 )
...
Prior to this commit, Solr's Jetty listened for connections on all
network interfaces. This commit changes it to only listen on localhost,
to prevent incautious administrators from accidentally exposing their
Solr deployment to the world.
Administrators who wish to override this behavior can set the
SOLR_JETTY_HOST property in their Solr include file
(solr.in.sh/solr.in.cmd) to "0.0.0.0" or some other value.
A version of this commit was previously reverted due to inconsistency
between SOLR_HOST and SOLR_JETTY_HOST. This commit fixes this issue.
2020-01-13 09:42:30 -05:00
0xflotus
5a73ad0178
Two minor Javadoc cleanups ( #1002 )
2020-01-13 09:22:04 -05:00
Jason Gerlowski
6e4756fd48
SOLR-13890: Add "top-level" DV "terms" implementation ( #1151 )
...
{!terms} queries have a docValues-based implementation that uses per-segment DV structures. This does well with a small to moderate (a few hundred) number of query terms, but doesn't well scale beyond that due to repetitive seeks done on each segment.
This commit introduces an implementation that uses a "top-level" docValues structure, which scales much better to very large {!terms} queries (many hundreds, thousands of terms).
2020-01-13 06:43:21 -05:00
RompotiMiranda
e5cff170b7
SOLR-13934: Improve SimplePostTool & bin/post docs ( #1013 )
...
Co-Authored-By: RompotiMiranda
2020-01-13 06:34:47 -05:00
Dawid Weiss
f9dde4de52
Merge remote-tracking branch 'origin/master' into gradle-master
2020-01-13 08:37:15 +01:00
Erick Erickson
3bae63d215
LUCENE-9080: Upgrade ICU4j to 62.2 and make regenerate work
2020-01-12 17:12:57 -05:00
Chris Hostetter
9a2497f637
SOLR-13486: Fix trivial test bug in TestTlogReplayVsRecovery
...
Add TODOs for future test improvements once underlying race condition is fixed in core code
2020-01-11 16:48:05 -07:00
Dawid Weiss
3beb1cfd1e
Add initial support for rendering javadocs.
2020-01-10 16:43:52 +01:00
Bruno Roustant
0b072ecedb
SOLR-6613: TextField.analyzeMultiTerm does not throw an exception when Analyzer returns no terms. (Bruno Roustant)
...
Closes #1146
2020-01-10 15:47:00 +01:00
Joel Bernstein
d68f3e1a44
SOLR-14130: Improve robustness of the logs parser
2020-01-10 08:39:00 -05:00
Dawid Weiss
5e2396d9fe
Merge remote-tracking branch 'origin/master' into gradle-master
2020-01-10 13:00:38 +01:00
Ishan Chattopadhyaya
6fb085943c
SOLR-14158: Package manager to read keys from package store, not ZK
2020-01-10 10:25:44 +05:30
Dawid Weiss
d7726495c5
Merge remote-tracking branch 'origin/master' into gradle-master
2020-01-09 19:22:09 +01:00
Kevin Risden
22155bf7a7
SOLR-14163: SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION needs to work with Jetty server/client SSL contexts
...
Closes #1147
Signed-off-by: Kevin Risden <krisden@apache.org>
2020-01-09 10:28:35 -05:00
noble
3b660d6b84
SOLR-14165: SolrResponse serialVersionUID has changed in a backward incompatible way
2020-01-10 01:17:50 +11:00
andywebb1975
ffe75fb441
SOLR-14165: set SolrResponse's serialVersionUID explicitly
2020-01-10 01:04:10 +11:00
Eric Pugh
8718447112
SOLR-13927: Correct v2 /schema APIs in docs ( #1010 )
2020-01-09 08:58:14 -05:00
Dawid Weiss
09fb6f196f
Don't assemble solr ref guide by default.
2020-01-09 13:48:06 +01:00
Dawid Weiss
2ba3ec7173
LUCENE-9124: updated build script for solr-ref-guide; newer plugin version and a workaround against gem proxy down.
2020-01-09 13:31:50 +01:00
Dawid Weiss
0674fada65
Merge remote-tracking branch 'origin/master' into gradle-master
2020-01-09 11:56:02 +01:00
Houston Putman
08b64aab8f
Revert "SOLR-11746: Existence query support for numeric point fields"
...
This reverts commit f5ab3ca688
.
2020-01-08 18:33:15 -05:00
Houston Putman
ee66e5ef23
Revert "SOLR-11746: Adding docs for negative existence queries."
...
This reverts commit 9edb143efd
.
2020-01-08 18:32:31 -05:00
Tomas Fernandez Lobbe
a9beeb1d1e
SOLR-14169: Fix 20 Resource Leak warnings in SolrJ's apache/solr/common
2020-01-08 11:16:32 -08:00
Dawid Weiss
7e4c841aa7
Merge remote-tracking branch 'origin/master' into gradle-master
2020-01-08 12:26:10 +01:00
Jason Gerlowski
a17c486424
Revert "SOLR-13985: Bind to localhost interface by default"
...
This temporarily reverts commit 479e73 while a potentially related
networking hiccup is investigated.
2020-01-07 09:05:13 -05:00
Dawid Weiss
405d227c55
Merge remote-tracking branch 'origin/master' into gradle-master
2020-01-07 08:45:12 +01:00
Houston Putman
9edb143efd
SOLR-11746: Adding docs for negative existence queries.
2020-01-06 13:08:13 -05:00
Houston Putman
f5ab3ca688
SOLR-11746: Existence query support for numeric point fields
2020-01-06 12:12:22 -05:00
Martijn Koster
ac777a5352
SOLR-13089: Fix lsof edge cases in the solr CLI script
2020-01-06 13:20:14 +01:00
Chris Hostetter
0fac7c1a26
SOLR-13486: Text improvements
...
* force a hard commit of all docs in TestCloudConsistency to work around bug in that test
* add new AwaitsFix'ed TestTlogReplayVsRecovery that more explicitly demonstrates the bug via TestInjection.updateLogReplayRandomPause
2020-01-03 15:12:23 -07:00
Mikhail Khludnev
8fba8eba13
SOLR-12490: Introducing json.queries to define many named queries in Query DSL.
2020-01-03 23:28:11 +03:00
Jason Gerlowski
479e736469
SOLR-13985: Bind to localhost interface by default
...
Prior to this commit, Solr's Jetty listened for connections on all
network interfaces. This commit changes it to only listen on localhost,
to prevent incautious administrators from accidentally exposing their
Solr deployment to the world.
Administrators who wish to override this behavior can set the
SOLR_JETTY_HOST property in their Solr include file
(solr.in.sh/solr.in.cmd) to "0.0.0.0" or some other value.
2020-01-03 15:17:24 -05:00
Nick Vercammen
1e0471a247
SOLR-14153: Return correct isolation level when retrieving it from the SQL Connection
...
As transactions are not supported a request to getTransactionIsolation() should return TRANSACTION_NONE (https://docs.oracle.com/javase/8/docs/api/java/sql/Connection.html#TRANSACTION_NONE )
Signed-off-by: Kevin Risden <krisden@apache.org>
2020-01-03 14:24:55 -05:00
Eric Pugh
50176fd6fc
SOLR-14157: Document backup/restore 'name' param ( #1133 )
2020-01-03 10:18:27 -05:00
Joel Bernstein
8df304d12e
SOLR-14130: Harden parsing logic
2020-01-03 08:47:19 -05:00
Joel Bernstein
8784d7c787
SOLR-14130: Fix precommit
2020-01-03 08:47:19 -05:00
Joel Bernstein
29c00d4fe7
SOLR-14130: Add postlogs command line tool for indexing Solr logs
2020-01-03 08:47:19 -05:00
Dawid Weiss
d2409fe499
Follow-up unused import removal.
2020-01-03 14:20:52 +01:00
Dawid Weiss
6d1e34d0cc
Follow-up unused import removal.
2020-01-03 14:20:21 +01:00
Dawid Weiss
985af95732
SOLR-13778: Solrj client will retry requests on SSLException with a suppressed SocketException (very likely a hard-closed socket connection)
2020-01-03 14:12:23 +01:00
Dawid Weiss
f789e053d2
Solrj client will retry requests on SSLException with a suppressed SocketException (very likely a hard-closed socket connection)
2020-01-03 14:09:37 +01:00
Dawid Weiss
2bab5ea442
Merge remote-tracking branch 'origin/master' into gradle-master
2020-01-03 11:02:55 +01:00
Andrzej Bialecki
7d0cf0df32
SOLR-13817: Clean up config files to remove the default 'class=' attribute in
...
standard caches.
2020-01-02 20:58:47 +01:00
Andrzej Bialecki
15d5e6662c
SOLR-14122: add unit test.
2020-01-02 14:02:54 +01:00
Andrzej Bialecki
38b9af21f1
SOLR-14122: SimUtils converts v2 to v1 request params incorrectly.
2020-01-02 13:54:45 +01:00
Dawid Weiss
1a690d95ad
Merge remote-tracking branch 'origin/master' into gradle-master
2020-01-02 10:49:19 +01:00
Nándor Mátravölgyi
4c9cc2cefd
LUCENE-9093: UnifiedHighlighter LengthGoalBreakIterator frag align
...
Matches in passages should be centered better on average.
Closes #1123
2020-01-01 00:57:00 -05:00
Dawid Weiss
a40b3e755b
Merge remote-tracking branch 'origin/master' into gradle-master
2019-12-31 10:08:07 +01:00
Dawid Weiss
5bb5f7eddf
Upgrade Randomizedtesting to 2.7.6
2019-12-31 09:42:44 +01:00
Jan Høydahl
c4993bc99c
SOLR-14129: Reuse Jackson ObjectMapper in AuditLoggerPlugin ( #1104 )
2019-12-30 17:40:32 +01:00
Cassandra Targett
6d24cacf78
Ref Guide: fix upgrade notes version typo
2019-12-30 10:03:13 -06:00
Jan Høydahl
33bd811fb8
SOLR-14109: Always log to stdout from server/scripts/cloud-scripts/zkcli.{bat|sh} ( #1130 )
2019-12-30 16:28:24 +01:00
Dawid Weiss
ca8661bc3a
Reworked dependency resolution for license checks to work around a problem with gradle. Consolidated licenses with the ant build (excluding some jars from the ref-guide).
2019-12-30 14:05:08 +01:00
Eric Pugh
5a50eaa2c6
Word choice should be starting, not staring ( #1128 )
2019-12-30 12:45:19 +01:00
Dawid Weiss
d79b678b39
Merge remote-tracking branch 'origin/master' into gradle-master
2019-12-30 09:24:46 +01:00
Robert Muir
1cb6e35058
SOLR-14141: eliminate JKS keystore from solr ssl docs.
...
Currently the documentation pretends to create a JKS keystore. It is
only actually a JKS keystore on java 8: on java9+ it is a PKCS12
keystore with a .jks extension (because PKCS12 is the new java default).
It works even though solr explicitly tells the JDK
(SOLR_SSL_KEY_STORE_TYPE=JKS) that its JKS when it is in fact not, due
to how keystore backwards compatibility was implemented.
Fix docs to explicitly create a PKCS12 keystore with .p12 extension and
so on instead of a PKCS12 keystore masquerading as a JKS one. This
simplifies the SSL steps since the "conversion" step (which was doing
nothing) from .JKS -> .P12 can be removed.
2019-12-29 09:34:00 -05:00
Mikhail Khludnev
3ae1a0b3ba
SOLR-13808: remove redundant @Repeat
2019-12-28 23:43:37 +03:00
Mikhail Khludnev
3f29fe0b80
SOLR-13808: caching {!bool filter=..} by default.
2019-12-28 21:48:11 +03:00
Dawid Weiss
0fce50593b
Add commons-csv to extraction deps.
2019-12-25 19:55:27 +01:00
Dawid Weiss
7350f03cd1
Reordered some lines and comments to make it easier to manually diff/ merge with gradle branch.
2019-12-25 13:29:11 +01:00
Dawid Weiss
584f564c91
Reordered some lines and comments to make it easier to manually diff/ merge with gradle branch.
2019-12-25 13:26:16 +01:00
Dawid Weiss
23f3fd2d48
Merge remote-tracking branch 'origin/master' into gradle-master
2019-12-25 13:14:57 +01:00
Jan Høydahl
aa43f352d9
SOLR-14146: Zookeeper version not resolved in RefGuide ( #1119 )
2019-12-24 23:06:27 +01:00
Robert Muir
3ab59aa1c9
SOLR-14120: Solr Admin UI breaks when using IE11
2019-12-24 11:27:44 -08:00
Robert Muir
b73e27d1ca
SOLR-14144: add IP-based access control to securing solr page
2019-12-24 07:55:42 -08:00
Robert Muir
b87e1f5843
SOLR-14143: add request logging to securing solr page
2019-12-24 06:46:29 -08:00
Robert Muir
efd13f2884
SOLR-13984: docs, changes.txt
2019-12-24 06:41:14 -08:00
Robert Muir
126d6b7767
SOLR-13984: add (experimental, disabled by default) security manager support ( #1082 )
...
* SOLR-13984: add (experimental, disabled by default) security manager support.
User can set SOLR_SECURITY_MANAGER_ENABLED=true to enable security manager at runtime.
The current policy file used by tests is moved to solr/server
Additional permissions are granted for the filesystem locations set by bin/solr, and networking everywhere is enabled.
This takes advantage of the fact that permission entries are ignored if properties are not defined:
https://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html#PropertyExp
2019-12-24 06:30:31 -08:00
Bruno Roustant
27840562a6
SOLR-14131: Add maxQueryLength option to DirectSolrSpellchecker.
...
Closes #1113
2019-12-24 15:05:00 +01:00
Robert Muir
72c99e921c
SOLR-14136: ip whitelist/blacklist via env vars ( #1111 )
...
SOLR-14136: ip whitelist/blacklist via env vars
This makes it easy to restrict access to Solr by IP. For example SOLR_IP_WHITELIST="127.0.0.1, 192.168.0.0/24, [::1], [2000:123:4:5::]/64" would restrict access to v4/v6 localhost, the 192.168.0 ipv4 network, and 2000:123:4:5 ipv6 network. Any other IP will receive a 403 response.
Blacklisting functionality can deny access to problematic addresses or networks that would otherwise be allowed. For example SOLR_IP_BLACKLIST="192.168.0.3, 192.168.0.4" would explicitly prevent those two specific addresses from accessing solr.
2019-12-23 19:26:11 -05:00
Nándor Mátravölgyi
1be5b68964
LUCENE-9091: UnifiedHighlighter HTML escaping should only
...
escape essentials
2019-12-23 17:20:48 -05:00
Robert Muir
403fd05646
SOLR-14138: changes.txt
2019-12-23 10:49:18 -08:00
Robert Muir
1425d6cbf8
SOLR-14138: enable request log via environ var, remove deprecated jetty class usage, respect SOLR_LOGS_DIR ( #1110 )
...
User can now set SOLR_REQUESTLOG_ENABLED=true to enable the jetty request log, instead of editing XML. The location of the request logs will respect SOLR_LOGS_DIR if that is set. The deprecated NCSARequestLog is no longer used, instead it uses CustomRequestLog with NCSA_FORMAT.
2019-12-23 10:37:31 -05:00
Noble Paul
ef15ae9805
SOLR-14125 : Streaming expressions to be loadable from packages ( #1108 )
...
SOLR-14125: Make <expressible> plugins work with packages
2019-12-23 15:20:26 +11:00
Tomas Fernandez Lobbe
c4f68bdab9
SOLR-14095: Let the overseer use javabin to store responses in ZooKeeper ( #1095 )
...
The Overseer used java serialization to store command responses in ZooKeeper. This commit changes the code to use Javabin instead, while allowing Java serialization with a System property in case it's needed for compatibility
2019-12-20 14:55:01 -08:00
Cassandra Targett
53423462f2
Ref Guide: various little typos; clean up Solr CLI section on bin/solr export
2019-12-20 15:00:22 -06:00
Dawid Weiss
5897b78572
Merge remote-tracking branch 'origin/master' into gradle-master
2019-12-20 17:35:40 +01:00
Andy Vuong
e428628054
SOLR-14107: Ensure bin/solr -q/-v args work with -e/example ( #1093 )
...
Co-authored-by: Andy Vuong <andyvvv.101@gmail.com>
2019-12-20 11:31:16 -05:00
Robert Muir
b7b6b0f3bf
SOLR-14112: do not display load average of -1.00 on windows in admin UI
2019-12-20 05:42:00 -05:00
Kevin Risden
aab3c5faa3
SOLR-14106: Cleanup Jetty SslContextFactory usage
...
Jetty 9.4.16.v20190411 and up introduced separate
client and server SslContextFactory implementations.
This split requires the proper use of of
SslContextFactory in clients and server configs.
This fixes the following
* SSL with SOLR_SSL_NEED_CLIENT_AUTH not working since v8.2.0
* Http2SolrClient SSL not working in branch_8x
Signed-off-by: Kevin Risden <krisden@apache.org>
2019-12-19 23:05:47 -05:00
Chris Hostetter
bc2770ebb8
SOLR-14128: SystemCollectionCompatTest - increase logging to aid in debuging future (jenkins) failures
2019-12-19 17:14:56 -07:00
Mike Drob
93585ba1d3
SOLR-13190 Surface Fuzzy term errors in Solr
...
Use newly added exceptions in Lucene for too complex fuzzy terms to
provide better error reporting for Solr queries.
2019-12-19 10:58:28 -06:00
Gus Heck
2f7276f935
Fix attribution
2019-12-19 10:50:37 -05:00
Jason Gerlowski
7cfa31b103
SOLR-14042: Fix varargs precommit warnings
2019-12-19 10:03:04 -05:00
Adrien Grand
868e41bc99
Minor improvements to the Solr changes.
2019-12-19 08:41:36 +01:00
Ishan Chattopadhyaya
cbfa781fe3
SOLR-14108: Handle missing verify commands or missing default params in Package Manager
2019-12-19 10:38:34 +05:30
Robert Muir
7490bfd828
SOLR-14085: remove solr fork of lucene test securitymanager
2019-12-18 23:06:31 -05:00
Chris Hostetter
d30f90e349
SOLR-14099: expanded comment on static final variable based on followup questions in Jira from Dawid
2019-12-18 16:36:34 -07:00
Matthias Krueger
1e5100d5a5
SOLR-14091: Removing deprecated configuration of Jetty's soLingerTime option
...
Signed-off-by: Kevin Risden <krisden@apache.org>
2019-12-18 17:24:43 -05:00
Cassandra Targett
fc2fbb2f7e
SOLR-13662: Improvements for Ref Guide package-manager.adoc
2019-12-18 09:28:16 -06:00
Dawid Weiss
206d62b9d5
Merge remote-tracking branch 'origin/master' into gradle-master
2019-12-18 15:10:04 +01:00
Robert Muir
56839f6ace
SOLR-13983: remove or replace process execution in SystemInfoHandler
2019-12-18 09:03:07 -05:00
Robert Muir
612cba38ca
SOLR-14110: sandbox javax.script usage in tests
2019-12-18 06:30:24 -05:00
Dawid Weiss
2e453afa28
Merge tika upgrade monster-patch. commons-csv excluded from gradle.
2019-12-18 09:51:57 +01:00
Dawid Weiss
28b19c2af2
Merge with master.
2019-12-18 09:32:35 +01:00
Dawid Weiss
71a5714e29
SOLR-14103: remove extra unused dependencies (jersey-core, jersey-server, netty-all).
2019-12-18 09:18:32 +01:00
Mikhail Khludnev
b0e532b7f3
SOLR-14051: removing Block Join Facet Component in favor of uniqueBlock(\_root_).
2019-12-18 11:16:53 +03:00
Gus Heck
46e5e13728
SOLR-13749 Cross collection join filter (XCJF)
...
Squashed commit of the following: commit ffa68a8adb9c5dc16578ab26f731da247533c980
2019-12-18 03:01:24 -05:00
Chris Hostetter
cc4262a8ec
SOLR-14099: Fixed @LogLevel annotation in test-framework to correctly 'unset' Loggers after test
2019-12-17 14:58:45 -07:00
Tim Allison
279a391cf3
SOLR-14054 -- upgrade to Tika 1.23 (and its dependencies) ( #1092 )
...
* SOLR-14054 -- upgrade to Tika 1.23 (and its dependencies)
* fix CHANGES.txt file
2019-12-17 16:09:08 -05:00
Chris Hostetter
8493cf18cb
Harden (Cloud)ExitableDirectoryReaderTest
...
Thread.sleep() is "subject to the precision and accuracy of system timers and schedulers."
But tests using DelayingSearchComponent need to ensure that it sleeps *at least* as long as they request, in order to trigger the timeAllowed constraint
2019-12-17 13:54:33 -07:00
Cassandra Targett
3e8872738a
Ref Guide: fix typos & standardize spellings
2019-12-17 12:59:17 -06:00
Cassandra Targett
3d4246089f
Ref Guide: make section headings in Headline Case
2019-12-17 12:12:34 -06:00
Cassandra Targett
6785650317
Ref Guide: Upgrade notes for 8.4
2019-12-17 12:02:26 -06:00
Chris Hostetter
33e44b2fd6
SOLR-13696: AwaitsFix RoutedAliasUpdateProcessorTest (and subclasses)
...
The helper method RoutedAliasUpdateProcessorTest.addDocsAndCommit doesn't garuntee docs have been committed when it returns, causing threading/timing bugs in tests that use it as a gate for making subsequent assertions -- causing a steady stream of jenkins test failures
2019-12-17 11:00:03 -07:00
Dawid Weiss
4b7bb7cf29
SOLR-14103: remove unused dependencies and their checksums, licenses.
2019-12-17 15:52:12 +01:00
Dawid Weiss
0f7a046e85
SOLR-14104: clean up asm license.
2019-12-17 15:11:57 +01:00
Dawid Weiss
868d5b4ae6
SOLR-14104: clean up asm license.
2019-12-17 15:07:44 +01:00
Dawid Weiss
98965b6c98
SOLR-14104: clean up asm license.
2019-12-17 15:07:38 +01:00
Dawid Weiss
0e2a493446
Add transitive Lucene dependencies so that Solr licenses/ folder is (more) consistent with ant. This is an insane hack at the build-level. Mark it for removal once we get rid of ant.
2019-12-17 15:02:08 +01:00
Dawid Weiss
079ddeb1f4
SOLR-14104: Remove a truckload of unused licenses and notice files.
2019-12-17 14:41:12 +01:00
Dawid Weiss
893f802e51
Remove a truckload of unused licenses and notice files.
2019-12-17 14:30:08 +01:00
Dawid Weiss
faadb65202
Regenerate checksum for a single dependency once. Add trailing newline for consistency with ant code.
2019-12-17 14:27:25 +01:00
Dawid Weiss
4c94a13e69
Merge remote-tracking branch 'origin/master' into gradle-master
2019-12-17 13:38:14 +01:00
Chris Hostetter
db11e9e9a2
SOLR-14081: re-implement FullSolrCloudDistribCmdsTest to extend SolrCloudTestCase
2019-12-16 15:58:06 -07:00
Chris Hostetter
e6b5da5c12
SOLR-14099: work around @LogLevel bug in LoggingHandlerTest
2019-12-16 12:13:03 -07:00
Robert Muir
dc35e5752b
LUCENE-9094: Ban ObjectInputStream and ObjectOutputStream in forbidden-apis
2019-12-16 13:31:11 -05:00
Andrzej Bialecki
b5a2cfba4f
SOLR-14094: Enable this test again in master.
2019-12-16 15:54:04 +01:00
Ishan Chattopadhyaya
ee0b066ab6
SOLR-14096: Stopping -Denable.packages=true from leaking to other tests
2019-12-16 20:20:07 +05:30
Andrzej Bialecki
83800c03df
Fix an occasional test error caused by the maintenance trigger generating events.
2019-12-16 13:54:36 +01:00
Ishan Chattopadhyaya
7dfea5fe33
SOLR-14087: Changing the filestore dir name back to filestore from .filestore
2019-12-16 18:18:53 +05:30
Adrien Grand
b660bcd0a2
SOLR-14094: Bad-apple TestSolrCachePerf.
2019-12-16 13:46:33 +01:00
Dawid Weiss
67d3cf678d
Merge with master.
2019-12-16 11:27:02 +01:00
Dawid Weiss
bc539fc0fd
Merge remote-tracking branch 'origin/master' into gradle-master
2019-12-16 11:20:45 +01:00
David Smiley
2db48314f9
SOLR-14072: Deprecate Blob API and runtimeLib ( #1086 )
2019-12-15 23:53:17 -05:00
noble
479db61df8
SOLR-14087: changed the filestore location to .filestore instead of $filestore
2019-12-16 15:51:36 +11:00
Noble Paul
d64c5c20b6
SOLR-14087: disable package store API if -Denable.packages not set to true
2019-12-16 08:04:33 +11:00
Kevin Risden
2f051a4bfe
SOLR-14086: Tika ClassNotFound error due to commons-compress in solr-core dependency
...
Introduced in SOLR-14033 by including
commons-compress as a compile time
dependency in Solr core instead of as
as test only dependency.
Signed-off-by: Kevin Risden <krisden@apache.org>
2019-12-15 13:39:52 -05:00
Ishan Chattopadhyaya
be0b963a22
SOLR-14071: Updating upgrade notice
2019-12-15 11:21:10 +05:30
Ishan Chattopadhyaya
640ff96522
SOLR-13662: Fixes to package manager
...
* Better logging and error reporting
* Fixing deploy command to handle previously undeployed packages
* Test now uses @LogLevel annotation
* Deploy command had a hard coded collection name by mistake, fix it
2019-12-15 10:44:02 +05:30
David Smiley
7c048c5070
SOLR-14069: Ref guide: overhaul: resources, libs, plugins, config-sets ( #1077 )
...
* split "resource-and-plugin-loading.adoc" into "resource-loading.adoc" and "libs.adoc" then overhauled both.
* enhanced "config-sets.adoc", moving some content in from elsewhere; bit of an overhaul.
* solr-plugins.adoc is now top-level; overhauled content
* Move resource-loading.adoc up a level in the TOC to underneath "The Well-Configured Solr Instance.
* Separate out the leading sentence.
2019-12-14 11:50:00 -05:00
yonik
49c34028ab
SOLR-13884: Ignore ConcurrentCreateCollectionTest
2019-12-14 09:31:13 -05:00
Kevin Risden
7a9a6ef79e
SOLR-14077: Hadoop shouldn't need to look for metrics config in user home
...
Signed-off-by: Kevin Risden <krisden@apache.org>
2019-12-13 22:08:48 -05:00
yonik
5f8e65c58f
SOLR-14079: fix SPLITSHARD splitByPrefix in async mode
2019-12-13 17:55:05 -05:00
yonik
db65c82c39
SOLR-13884: detect multiple replicas on single node
2019-12-13 17:37:44 -05:00
yonik
73c535261c
SOLR-13884: use policies, preferences
2019-12-13 17:37:44 -05:00
yonik
fae6aebc74
SOLR-13884: add ConcurrentCreateCollectionTest test
2019-12-13 17:37:44 -05:00
erick
2feeb88c29
SOLR-14026: Upgrade Jetty to 9.4.24.v20191120 and dropwizard to 4.1.2, moved to 8.5 in CHANGES.txt
2019-12-13 12:42:09 -05:00
Dawid Weiss
208d094262
Remove checksum files from ref guide.
2019-12-13 17:09:25 +01:00
erick
8278886966
SOLR-14026: Upgrade Jetty to 9.4.24.v20191120 and dropwizard to 4.1.2
2019-12-13 10:01:37 -05:00
Dawid Weiss
abd5102312
Merge with master.
2019-12-13 15:35:14 +01:00
Dawid Weiss
16466d5256
Add dependency on log4j-1.2 api for solr core tests.
2019-12-13 15:32:59 +01:00
Dawid Weiss
d130bffa8f
LUCENE-9092: Upgrade randomizedtesting to 2.7.5 and Carrot2 to 3.16.2
2019-12-13 15:13:26 +01:00
Dawid Weiss
3aff1664e5
updateChecksums, validation of dangling unreferenced files under licenses/. Separated licenses-gradle for Solr for now (doesn't include transitive Lucene dependencies).
2019-12-13 15:07:59 +01:00
Dawid Weiss
d7c2e3029b
Ignore gradle files for rat checks.
2019-12-13 13:44:18 +01:00
Dawid Weiss
4500f0e327
Consolidating versions between gradle and ant.
2019-12-13 13:31:23 +01:00
Dawid Weiss
528a2ecb56
LUCENE-9092: Upgrade randomizedtesting to 2.7.5 and Carrot2 to 3.16.2 (follow-up)
2019-12-13 12:12:11 +01:00
Dawid Weiss
517261dcff
LUCENE-9092: Upgrade randomizedtesting to 2.7.5 and Carrot2 to 3.16.2
2019-12-13 12:11:38 +01:00
Dawid Weiss
035cede6b8
Merge remote-tracking branch 'origin/master' into gradle-master
2019-12-13 10:51:14 +01:00
Robert Muir
f083f40b28
SOLR-14076: clean up static fields leak in nightly-only test
2019-12-13 04:06:07 -05:00
Kevin Risden
3ba005465a
SOLR-14048: Improve Hadoop test sanity checks
...
Signed-off-by: Kevin Risden <krisden@apache.org>
2019-12-12 21:27:38 -05:00
Andrzej Bialecki
e155649026
SOLR-13975: Make sure the stall time is adjusted up when an unusually long
...
poll time is configured.
2019-12-12 19:58:03 +01:00
Dawid Weiss
c40689875a
Correct regexes normalizing jar filenames so that the resulting licenses are consistent with gradle (which will use proper artifact name, not a chain of regexes).
2019-12-12 19:26:46 +01:00
Dawid Weiss
b29b731a2c
Correct regexes normalizing jar filenames so that the resulting licenses are consistent with gradle (which will use proper artifact name, not a chain of regexes).
2019-12-12 19:25:22 +01:00
Dawid Weiss
4cee6c68c7
Merge remote-tracking branch 'origin/master' into gradle-master
2019-12-12 17:27:28 +01:00
Kevin Risden
322ed8ce4d
SOLR-14047: Make sure tests don't pickup other Hadoop installs
...
Signed-off-by: Kevin Risden <krisden@apache.org>
2019-12-12 10:23:29 -05:00
Dawid Weiss
6094d4dd13
Merge remote-tracking branch 'origin/master' into gradle-master
2019-12-12 14:16:48 +01:00
noble
4d5df0e20a
SOLR-14013: FIX: javabin performance regressions
2019-12-12 23:38:35 +11:00
noble
b35f1debe3
SOLR-14013: javabin performance regressions
2019-12-12 23:26:37 +11:00
Ishan Chattopadhyaya
57e717eff2
SOLR-14065: Deprecate Velocity
2019-12-12 16:13:32 +05:30
Ishan Chattopadhyaya
7097e9c41a
SOLR-13978: Removed LTR from default configset
2019-12-12 15:09:21 +05:30
Ishan Chattopadhyaya
fa1ad006b6
SOLR-14071: Untrusted configsets shouldn't be allowed to use <lib> directive
2019-12-12 15:00:09 +05:30
Adrien Grand
b72365ae21
Add next minor version 8.5
2019-12-12 09:37:51 +01:00
Ishan Chattopadhyaya
dce36c10e9
SOLR-13978: Remove non-essential components from default configset
...
The default configset no longer has the following:
- Library inclusions (<lib ../>) for extraction, solr-cell libs, clustering, velocity and language identifier
- /browse, /tvrh and /update/extract handlers
- TermVector component (if someone wants it, can be added using config APIs)
- XSLT response writer
- Velocity response writer
If you want to use them in your collections, please add them to your configset manually or through the Config APIs.
2019-12-12 10:43:31 +05:30
Munendra S N
88b5b5a7cd
SOLR-13970: disallow using collapse/expand with grouping
...
* Using collapse with grouping would cause inconsistent behavior.
This is because grouping calls the same postfilter twice without
resetting the internal state of the DocValues cache
* Using expand with grouping would cause NPE
2019-12-12 10:21:20 +05:30
Ishan Chattopadhyaya
f681d433ae
SOLR-14062: Split IndexSizeTriggerTest into three
2019-12-12 10:12:17 +05:30
Ishan Chattopadhyaya
8db8ab3be2
SOLR-13945: SPLITSHARD can cause data loss due to rollback when final commit fails
2019-12-12 08:58:34 +05:30
Kevin Risden
861c77cb17
SOLR-14053: Fix HDFS tests to be ignored if Native I/O isn't available (remove tests.disableHdfs)
...
Signed-off-by: Kevin Risden <krisden@apache.org>
2019-12-11 22:02:07 -05:00
Joel Bernstein
d559f47222
SOLR-14060: Update CHANGES.txt
2019-12-11 20:59:23 -05:00
Joel Bernstein
ee0a6b45ca
SOLR-14060: Allow the random Streaming Expression to create the x-axis
2019-12-11 20:37:20 -05:00
Mikhail Khludnev
f01b3e97d1
SOLR-13904: Make Analytics component sensitive to timeAllowed.
2019-12-11 23:48:17 +03:00
Robert Muir
dc031ea382
SOLR-14050: clean up tests use of network addresses
...
Solr tests now have a similar policy to Lucene, loopback use only. If a
test tries to resolve or connect to the internet, it will get SecurityException.
Some solr tests explicitly try to talk to dead nodes with real
networking. This is not good and asking for trouble, but use low loopback port numbers instead of
multicast addresses. The idea is that it fails faster. Move these to
constants so that stuff isn't copy-pasted everywhere, in case we have to
do something different later.
2019-12-11 12:51:45 -05:00