tree e42a966bb6d9a2e30f50ac493348ea73d6c7825e
parent b5f183e91ea5b72c26578a6caab8d77769f9c014
parent 56918394544b6207a626cb0938d0bba4927a9fa4
author Marco Miller <marco.miller@ericsson.com> 1592328304 -0400
committer Marco Miller <marco.miller@ericsson.com> 1592328304 -0400

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Revert "Remove documentation of obsolete gerrit.canLoadInIFrame"
  Fix typos in note-db.txt
  Document skipping of reindexing step for offline NoteDB migration
  Report end of NoteDB migration when skipping reindexing
  Clarify that index.batchThreads is relevant for offline reindexing
  Add project to output when reindexing changes in verbose mode
  Auto-flush SiteIndexer's PrintWriters
  Allow to re-index in verbose mode during NoteDB migration
  Avoid closing System.out after All-Users GC in NoteDB migration
  Honor project watches also for changes created via cherry-pick
  Report the index state after re-indexing

Change-Id: Icb446c6b8889e6eea790b2fe5ebc8e83ebc39082