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: 4e4f7fd aef3208)

author	Alex Rousskov <rousskov@measurement-factory.com>
	Thu, 21 Mar 2013 21:06:48 +0000 (15:06 -0600)
committer	Alex Rousskov <rousskov@measurement-factory.com>
	Thu, 21 Mar 2013 21:06:48 +0000 (15:06 -0600)
commit	a57a662c34744c827637a5cf8ddce25aa6048c9a
tree	eb292b47a4240e0c4acfb62ca8f79eccbff8ebe4	tree \| snapshot
parent	4e4f7fd92d664af9928060a3f36873bc22ff8162	commit \| diff
parent	aef3208d890c426d8dc97f1c39aeb1b960c755bc	commit \| diff

Merged from trunk (r12732, v3.3.3+).

18 files changed:

include/snmp_impl.h	diff1 \|	diff2 \|	blob \| history
scripts/find-alive.pl	diff1 \|	diff2 \|	blob \| history
src/DiskIO/IpcIo/IpcIoFile.cc	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/StoreIOState.h	diff1 \|	diff2 \|	blob \| history
src/cf.data.pre	diff1 \|	diff2 \|	blob \| history
src/client_side_reply.cc	diff1 \|	diff2 \|	blob \| history
src/client_side_reply.h	diff1 \|	diff2 \|	blob \| history
src/fs/coss/store_coss.h	diff1 \|	diff2 \|	blob \| history
src/fs/coss/store_io_coss.cc	diff1 \|	diff2 \|	blob \| history
src/fs/rock/RockIoState.cc	diff1 \|	diff2 \|	blob \| history
src/fs/rock/RockSwapDir.cc	diff1 \|	diff2 \|	blob \| history
src/fs/ufs/RebuildState.cc	diff1 \|	diff2 \|	blob \| history
src/ipc/StoreMap.h	diff1 \|	diff2 \|	blob \| history
src/store.cc	diff1 \|	diff2 \|	blob \| history
src/store_rebuild.cc	diff1 \|	diff2 \|	blob \| history
src/store_swapout.cc	diff1 \|	diff2 \|	blob \| history
src/tests/stub_store.cc	diff1 \|	diff2 \|	blob \| history

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