git.ipfire.org Git - thirdparty/squid.git/commit

]> git.ipfire.org Git - thirdparty/squid.git/commit

projects / thirdparty / squid.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7e62a74 91ee081)

author	Amos Jeffries <squid3@treenet.co.nz>
	Wed, 14 Jan 2015 15:11:26 +0000 (07:11 -0800)
committer	Amos Jeffries <squid3@treenet.co.nz>
	Wed, 14 Jan 2015 15:11:26 +0000 (07:11 -0800)
commit	7dcca85b904e395fd71ddb45ba20d22d77e7bfdd
tree	8778ebf71b1f7ba94c14500c186f844cd0b77775	tree \| snapshot
parent	7e62a74f1094fd994fe1377a8e3b7fc2ccb1b85a	commit \| diff
parent	91ee0817f79140d848034828fdc263cdc79eabe2	commit \| diff

Merge from trunk

14 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
doc/release-notes/release-3.6.sgml	diff1 \|	diff2 \|	blob \| history
src/CachePeer.h	diff1 \|	diff2 \|	blob \| history
src/FwdState.cc	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/PeerPoolMgr.cc	diff1 \|	diff2 \|	blob \| history
src/SquidConfig.h	diff1 \|	diff2 \|	blob \| history
src/cache_cf.cc	diff1 \|	diff2 \|	blob \| history
src/cf.data.depend	diff1 \|	diff2 \|	blob \| history
src/cf.data.pre	diff1 \|	diff2 \|	blob \| history
src/cf_gen_defines	diff1 \|	diff2 \|	blob \| history
src/ssl/PeerConnector.cc	diff1 \|	diff2 \|	blob \| history
src/ssl/support.cc	diff1 \|	diff2 \|	blob \| history
src/tunnel.cc	diff1 \|	diff2 \|	blob \| history

Mirror of https://github.com/squid-cache/squid.git