Google Git
Sign in
fuchsia / integration / cbc8163d2960f95e8f341f223e32ea3d2f5fc706
commitcbc8163d2960f95e8f341f223e32ea3d2f5fc706[log] [tgz]
authorAidan Wolter <awolter@fuchsia.infra.roller.google.com>Wed Mar 26 10:55:22 2025 -0700
committerCopybara-Service <copybara-worker@google.com>Wed Mar 26 10:56:51 2025 -0700
tree7a2e7ab5947d0d420fd62f16f0d4e197a1e17850
parentec8b2d9cbc998e103c49a9baef753e5dcc2126a4 [diff]
[roll] Roll fuchsia [assembly] Remove config_schema/src/merge.rs

This is unused now that AssemblyContainer manages overrides merging.

Original-Bug: 400719840
Original-Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1236926
Original-Revision: b2ccdc7d648538ca38969c58b9b0fd9c685b1580
GitOrigin-RevId: d85ff8ba56170c0823e16c598100bdeb8c915680
Change-Id: I4fe5edb9192c6aca3e33a06ebdc64f0fca42bd46
1 file changed
tree: 7a2e7ab5947d0d420fd62f16f0d4e197a1e17850
  1. ctf/
  2. git-hooks/
  3. infra/
  4. third_party/
  5. cts
  6. firmware
  7. flower
  8. jiri.lock
  9. MILESTONE
  10. minimal
  11. prebuilts
  12. README.md
  13. stem
  14. test_durations
  15. toolchain
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.