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: 5038f9d 93a5c86)

author	Alex Rousskov <rousskov@measurement-factory.com>
	Fri, 18 Feb 2011 23:58:13 +0000 (16:58 -0700)
committer	Alex Rousskov <rousskov@measurement-factory.com>
	Fri, 18 Feb 2011 23:58:13 +0000 (16:58 -0700)
commit	ed23106148e17198c6c7029e1feec1f3e6ab682d
tree	a849093f961144c72c4d64490a100769516fb78d	tree \| snapshot
parent	5038f9d8c3dc4352098b16cb8665a4f89d5de70a	commit \| diff
parent	93a5c860a117f1a9ac1f6880afac003304d9e51f	commit \| diff

Merged from parent (trunk r11240, circa 3.2.0.5+)

12 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
src/HttpHeader.cc	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/adaptation/ServiceConfig.cc	diff1 \|	diff2 \|	blob \| history
src/adaptation/ecap/MessageRep.cc	diff1 \|	diff2 \|	blob \| history
src/cf.data.pre	diff1 \|	diff2 \|	blob \| history
src/client_side.cc	diff1 \|	diff2 \|	blob \| history
src/client_side_request.cc	diff1 \|	diff2 \|	blob \| history
src/log/FormatSquidCustom.cc	\|	diff2 \|	blob \| history
src/log/Tokens.cc	\|	diff2 \|	blob \| history
src/log/Tokens.h	\|	diff2 \|	blob \| history
src/log/access_log.cc	diff1 \|	diff2 \|	blob \| history

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