Google Git
Sign in
fuchsia/integration/0256b3a014d0c765ddf6117b1555712c0d0509d5
commit
0256b3a014d0c765ddf6117b1555712c0d0509d5
[log]
author
Cameron Finucane <eep@fuchsia.infra.roller.google.com>
Tue Feb 17 13:30:30 2026 -0800
committer
Copybara-Service <copybara-worker@google.com>
Tue Feb 17 13:32:44 2026 -0800
tree
7dda4fcb7b0b2d9b1d43e8f8f23dec8848bd05a1
parent
b9c64f372614e4a75cdbd140e439c579e8135577 [diff]
[roll] Roll fuchsia [ffx][fuzz] Extend test timeout to avoid flaking

This is an intermediate fix to address flakes in `shell::tests::test_merge`.

Original-Bug: 451694664
Original-Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1508464
Original-Revision: 7a628399acbfc5b9488884f59834a5b5fd84a5eb
GitOrigin-RevId: b75884f05c1b3ae51c5f562759a81598f51d7da4
Change-Id: I37ec988e150d8e54ad0c47caa20734bb26f92c4d
1 file changed
tree: 7dda4fcb7b0b2d9b1d43e8f8f23dec8848bd05a1
  1. ctf/
  2. git-hooks/
  3. infra/
  4. third_party/
  5. cobalt
  6. flower
  7. jiri.lock
  8. MILESTONE
  9. minimal
  10. prebuilts
  11. README.md
  12. stem
  13. test_durations
README.md

Integration

This repository contains Fuchsia's Global Integration manifest files.

Making changes

All changes should be made to the internal version of this repository. Our infrastructure automatically updates this version when the internal one changes.

Currently all changes must be made by a Google employee. Non-Google employees wishing to make a change can ask for assistance in one of the communication channels documented at get involved.

Obtaining the source

First install Jiri.

Next run:

$ jiri init
$ jiri import minimal https://fuchsia.googlesource.com/integration
$ jiri update

Third party

Third party projects should have their own subdirectory in ./third_party.