www.project-moonshot.org Git - trust_router.git/commit

projects / trust_router.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b46df3e 5bfbc89)

author	Sam Hartman <hartmans@debian.org>
	Tue, 10 Mar 2015 00:45:38 +0000 (20:45 -0400)
committer	Sam Hartman <hartmans@debian.org>
	Tue, 10 Mar 2015 00:45:38 +0000 (20:45 -0400)
commit	39c2dec6054da6fb692b40f6b5ac374795b17092
tree	2da1970c35e0f0f88028c3a85c7c1dccb3e0ca4d	tree \| snapshot
parent	b46df3e23c665ef124fc06417a4d8dadd382a251	commit \| diff
parent	5bfbc89bff7cdbdb6a8ba91493888ff48056411d	commit \| diff

Real syslog support for trust router

Merge branch 'logging_changes' of https://github.com/adam-bishop/trust_router

Conflicts:
common/tr_config.c
common/tr_msg.c
tr/tr_main.c

Makefile.am	diff1 \|	diff2 \|	blob \| history
common/tr_config.c	diff1 \|	diff2 \|	blob \| history
common/tr_msg.c	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
tid/tid_req.c	diff1 \|	diff2 \|	blob \| history
tr/tr_main.c	diff1 \|	diff2 \|	blob \| history

Moonshot Trust Router