commit 8d6cea885cc2c66265df53f0972cdac892cf83ac
author Austin Schuh <austin.linux@gmail.com> Fri Feb 28 12:17:16 2020 -0800
committer Austin Schuh <austin.linux@gmail.com> Fri Feb 28 13:36:48 2020 -0800
tree c440fa5569da30f124f8bc4ea5cb8045ac8edc84
parent 7289ae3f9fea72d3a4f054f1798bd7c8f4204b70

Add MergeWithConfig

When dealing with logs, sometimes you need to add a new channel.  It is
easiest to just specify the json to merge in with the log file.  Make
this a function.

Change-Id: I7bd8bde72aa0103ec9c4ae0019164566787c54a2

aos/BUILD

diff --git a/aos/BUILD b/aos/BUILD
index 12d25b2..1d6d388 100644
--- a/aos/BUILD
+++ b/aos/BUILD
@@ -477,6 +477,7 @@
         "testdata/config2_multinode.json",
         "testdata/config3.json",
         "testdata/expected.json",
+        "testdata/expected_merge_with.json",
         "testdata/expected_multinode.json",
         "testdata/good_multinode.json",
         "testdata/good_multinode_hostnames.json",