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: 0ef0509 0b4fb91)

author	Alex Rousskov <rousskov@measurement-factory.com>
	Tue, 30 Aug 2011 15:04:30 +0000 (09:04 -0600)
committer	Alex Rousskov <rousskov@measurement-factory.com>
	Tue, 30 Aug 2011 15:04:30 +0000 (09:04 -0600)
commit	899249853a35bcad559ce23daa292a2c7a48c7a4
tree	278eaef0a8679c241c73c7dcbf8de8bd9baade55	tree \| snapshot
parent	0ef0509e3574f91c83c22b13496343ccf765564b	commit \| diff
parent	0b4fb91ae284d0cd1b34336a73a9273467b1ddfa	commit \| diff

Merged from parent (trunk r11691, v3.2.0.11+).

18 files changed:

src/Store.h	diff1 \|	diff2 \|	blob \| history
src/cache_cf.cc	diff1 \|	diff2 \|	blob \| history
src/cf.data.pre	diff1 \|	diff2 \|	blob \| history
src/client_side.cc	diff1 \|	diff2 \|	blob \| history
src/comm.cc	diff1 \|	diff2 \|	blob \| history
src/comm.h	diff1 \|	diff2 \|	blob \| history
src/format/Format.cc	diff1 \|	diff2 \|	blob \| history
src/format/Tokens.h	diff1 \|	diff2 \|	blob \| history
src/fs/ufs/ufscommon.cc	diff1 \|	diff2 \|	blob \| history
src/http.cc	diff1 \|	diff2 \|	blob \| history
src/ipc/StoreMap.h	diff1 \|	\|	blob \| history
src/main.cc	diff1 \|	diff2 \|	blob \| history
src/neighbors.cc	diff1 \|	diff2 \|	blob \| history
src/protos.h	diff1 \|	diff2 \|	blob \| history
src/store_rebuild.cc	diff1 \|	diff2 \|	blob \| history
src/structs.h	diff1 \|	diff2 \|	blob \| history
src/tests/stub_cache_cf.cc	diff1 \|	diff2 \|	blob \| history
src/tools.cc	diff1 \|	diff2 \|	blob \| history

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