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

author	Sam Hartman <hartmans@debian.org>
	Wed, 18 Jun 2014 19:36:13 +0000 (15:36 -0400)
committer	Sam Hartman <hartmans@debian.org>
	Wed, 18 Jun 2014 19:36:13 +0000 (15:36 -0400)
commit	50ebea79edb064ea7149bf937405482370251af2
tree	566f1501a7e01d9a43426568c96406d4ddbde232	tree \| snapshot
parent	916f0b7b7e6f541981ffcc1c94682aec071a9093	commit \| diff
parent	4039aa19fbbea4503a81be519b0c3703783cb38d	commit \| diff

Merge tag 'release_3_0_4_rc1' into tr-upgrade

Conflicts:
share/dictionary.freeradius.internal
src/main/listen.c
src/main/realms.c
src/main/tls.c
src/main/tls_listen.c
src/modules/rlm_realm/rlm_realm.c

12 files changed:

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

share/dictionary.freeradius.internal	diff1 \|	diff2 \|	blob \| history
src/include/radius.h	diff1 \|	diff2 \|	blob \| history
src/include/realms.h	diff1 \|	diff2 \|	blob \| history
src/include/tls-h	diff1 \|	diff2 \|	blob \| history
src/main/realms.c	diff1 \|	diff2 \|	blob \| history
src/main/tls.c	diff1 \|	diff2 \|	blob \| history
src/main/tls_listen.c	diff1 \|	diff2 \|	blob \| history
src/modules/rlm_eap/libeap/eap_chbind.c	diff1 \|	\|	blob \| history
src/modules/rlm_eap/libeap/eapcommon.c	diff1 \|	diff2 \|	blob \| history
src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c	diff1 \|	diff2 \|	blob \| history
src/modules/rlm_realm/rlm_realm.c	diff1 \|	diff2 \|	blob \| history
src/modules/rlm_realm/trustrouter_integ.c	diff1 \|	\|	blob \| history