projects
/
trust_router.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8190a0b
)
Updates to the way configuration is merged.
author
Margaret Wasserman
<margaret@moonshot-proxy>
Wed, 3 Jul 2013 08:01:48 +0000
(
04:01
-0400)
committer
Margaret Wasserman
<margaret@moonshot-proxy>
Wed, 3 Jul 2013 08:01:48 +0000
(
04:01
-0400)
common/tr_config.c
patch
|
blob
|
history
diff --git
a/common/tr_config.c
b/common/tr_config.c
index
b5e12f0
..
9e622fe
100644
(file)
--- a/
common/tr_config.c
+++ b/
common/tr_config.c
@@
-610,6
+610,7
@@
json_t *tr_read_config (int n, struct dirent **cfg_files) {
return NULL;
}
+ /* TBD -- instead of using json_object_update, iterate through files for non-overlap config? */
if (!jcfg) {
jcfg = temp;
}else {