]> git.ipfire.org Git - ipfire-2.x.git/blob - src/patches/squid/squid-3.5-14069.patch
Merge branch 'unbound' into next
[ipfire-2.x.git] / src / patches / squid / squid-3.5-14069.patch
1 ------------------------------------------------------------
2 revno: 14069
3 revision-id: squidadm@squid-cache.org-20160723121351-iuc8hwstrqd0l1dv
4 parent: squid3@treenet.co.nz-20160723071930-cemledcltg8pkc28
5 committer: Source Maintenance <squidadm@squid-cache.org>
6 branch nick: 3.5
7 timestamp: Sat 2016-07-23 12:13:51 +0000
8 message:
9 SourceFormat Enforcement
10 ------------------------------------------------------------
11 # Bazaar merge directive format 2 (Bazaar 0.90)
12 # revision_id: squidadm@squid-cache.org-20160723121351-\
13 # iuc8hwstrqd0l1dv
14 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
15 # testament_sha1: c9e37a723686ae2ee489ba7ec2e981ae153bda28
16 # timestamp: 2016-07-23 12:50:56 +0000
17 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
18 # base_revision_id: squid3@treenet.co.nz-20160723071930-\
19 # cemledcltg8pkc28
20 #
21 # Begin patch
22 === modified file 'src/tests/stub_CacheDigest.cc'
23 --- src/tests/stub_CacheDigest.cc 2016-07-23 07:16:20 +0000
24 +++ src/tests/stub_CacheDigest.cc 2016-07-23 12:13:51 +0000
25 @@ -29,3 +29,4 @@
26 void cacheDigestGuessStatsReport(const CacheDigestGuessStats *, StoreEntry *, const char *) STUB
27 void cacheDigestReport(CacheDigest *, const char *, StoreEntry *) STUB
28 uint32_t cacheDigestCalcMaskSize(uint64_t, uint8_t) STUB_RETVAL(1)
29 +
30