15547 Commits

Author SHA1 Message Date
millmanorama
e563f81ccb Merge remote-tracking branch 'upstream/rc-2.8.3' into 2960-only-store-content-id-in-keywordhit 2017-08-28 00:21:19 -04:00
U-BASIS\dgrove
e8d369deec Revised class to get rid of unused code. 2017-08-25 13:17:44 -04:00
Ann Priestman
2a7ff9cb4a Testing old method 2017-08-25 12:10:43 -04:00
Ann Priestman
27b0575d7d Use commit block instead of addBatch 2017-08-25 10:01:26 -04:00
Eugene Livis
4585ee3ac3 Minor 2017-08-24 16:14:30 -04:00
Eugene Livis
8c6bb9bd94 Minor 2017-08-24 16:13:54 -04:00
Eugene Livis
12f0ca2695 Reverted code to retry solr core open 2017-08-24 15:55:29 -04:00
Eugene Livis
160a241780 Pulling commons-io version 2.5 instead of 2.4 2017-08-24 14:19:37 -04:00
esaunders
da2efd0fad Merge pull request #3016 from eugene7646/core_open_retry_2941
Core open re-try (2941)
2017-08-23 10:22:32 -04:00
Eugene Livis
b77fcb74c0 Fixed typos 2017-08-23 09:06:51 -04:00
Eugene Livis
bcdf7880c2 Fixed typos 2017-08-23 09:05:28 -04:00
millmanorama
8a7da368ad more cleanup 2017-08-23 04:57:58 -04:00
millmanorama
9bdf496abe cleanup 2017-08-23 04:44:37 -04:00
millmanorama
88ca4a2a24 Merge remote-tracking branch 'upstream/rc-2.8.3' into 2638-only-store-content-id-in-keywordhit
# Conflicts:
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordCachedArtifact.java
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQuery.java
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/QueryResults.java
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/RegexQuery.java
#	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermsComponentQuery.java
2017-08-23 04:09:08 -04:00
Eugene Livis
909fda73fb Minor 2017-08-22 17:20:49 -04:00
Eugene Livis
b7845f9af0 Minor 2017-08-22 17:12:56 -04:00
Eugene Livis
bcefce9080 Added re-tries for opening Solr cores 2017-08-22 16:25:42 -04:00
U-BASIS\dgrove
d11c827e7b New AID implemented. 2017-08-22 15:05:15 -04:00
esaunders
2cd1b78cc6 Merge pull request #3012 from millmanorama/2322-remove-KeywordCachedArtifact
2322 remove KeywordCachedArtifact
2017-08-22 13:48:55 -04:00
esaunders
79b17fe17a Pass weak listener references to event publisher to allow blackboard artifact nodes to be garbage collected. 2017-08-22 10:28:43 -04:00
millmanorama
77783d1537 minor cleanup 2017-08-22 03:10:31 -04:00
millmanorama
7d6dfaa7ea remove KeywordCachedArtifact 2017-08-22 02:19:51 -04:00
esaunders
41b72dd48c Merge pull request #3010 from eugene7646/solr_timeout_2887
Added timeout to Solr queries
2017-08-21 17:59:12 -04:00
U-BASIS\zhaohui
8b128fa2ae 2682: merge the script updates with current develop code base 2017-08-21 09:06:35 -04:00
Eugene Livis
3639dcca2a Added timeout to Solr queries 2017-08-18 15:14:24 -04:00
William Schaefer
df831d3f80 2934 fixed case with SQLite CR creation where directory exists but is protected 2017-08-17 11:34:56 -04:00
William Schaefer
7dcf39698b 2934 fixed issue with SQLite db creation for CR not handling SecurityExceptions 2017-08-17 10:24:47 -04:00
Ann Priestman
f11b2aa334 Write imported hashes to the database in sets 2017-08-17 08:33:36 -04:00
Richard Cordovano
edc642dca3 Merge pull request #3006 from esaunders/2922_string_memory
Use new Java garbage collector with string deduplication.
2017-08-16 19:12:51 -04:00
U-BASIS\dgrove
22dc9dc76c AID separation with fixes. 2017-08-16 13:25:36 -04:00
esaunders
097be96632 Merge pull request #3001 from millmanorama/2638-hitsMultiMap
2638 hits multi map
2017-08-16 12:32:54 -04:00
U-BASIS\dgrove
70339153e1 Sync 2017-08-16 11:44:14 -04:00
U-BASIS\dgrove
7254a25ff8 Sync 2017-08-16 11:11:04 -04:00
millmanorama
976952b52e cleanup in KeywordHit 2017-08-16 11:03:35 -04:00
Ann Priestman
10d0d39b03 Removed unused import 2017-08-16 10:24:38 -04:00
Ann Priestman
7b16f58941 Add locking to sqlite database calls 2017-08-16 09:46:09 -04:00
Richard Cordovano
b6ebe15da0 Merge pull request #3005 from zhhl/2918_updateScriptAndGold
2918 update script and gold
2017-08-15 15:32:30 -04:00
U-BASIS\zhaohui
84813bc558 2918: updates for single-user case 2017-08-15 15:21:57 -04:00
U-BASIS\zhaohui
8c08d6dd32 2918: update the config.xml for usage of the recent regression test updates 2017-08-15 15:12:13 -04:00
U-BASIS\zhaohui
53e8b772d1 2918: clean up 2017-08-15 14:55:31 -04:00
millmanorama
659d48f523 cleanup Javadoc 2017-08-15 14:46:04 -04:00
U-BASIS\zhaohui
caad6cbf50 2918: Remove obj_id number from case directory. Add artifact type to path 2017-08-15 14:44:58 -04:00
William Schaefer
f93f6694f3 2934 Central repo option stay disabled during ingest now 2017-08-15 14:33:42 -04:00
Ann Priestman
5fd3c4aa95 Use counts of files + message type artifacts to determine node counts/whether a node is a leaf node 2017-08-15 12:39:08 -04:00
William Schaefer
e8c987b752 2826 change import hashdb options panel to get file type reliably 2017-08-15 11:17:20 -04:00
William Schaefer
f8490ed1f0 2934 minor formatting and removing unused import fixes for central repo gui 2017-08-15 10:07:09 -04:00
William Schaefer
a0d9fb00c2 2934-remove un-used code from central repo code 2017-08-15 10:01:46 -04:00
U-BASIS\zhaohui
06ade78d34 Merge remote-tracking branch 'upstream/develop' into 2918_updateScriptAndGold 2017-08-15 09:45:20 -04:00
William Schaefer
f28900ac2a 2934 fixed bundle messages for labels on Central repo GUI 2017-08-14 18:28:52 -04:00
William Schaefer
5b3a3204c8 Clean up Central GUI changes, remove un-used code, refactor some names 2017-08-14 18:07:15 -04:00