projects / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 6edc270a MF |
1 | ------------------------------------------------------------ |
| 2 | revno: 14181 | |
| 3 | revision-id: squidadm@squid-cache.org-20170701121615-ktx76udds2mzmc6c | |
| 4 | parent: squid3@treenet.co.nz-20170701120848-q2xznzfvxb4kwvb6 | |
| 5 | committer: Source Maintenance <squidadm@squid-cache.org> | |
| 6 | branch nick: 3.5 | |
| 7 | timestamp: Sat 2017-07-01 12:16:15 +0000 | |
| 8 | message: | |
| 9 | SourceFormat Enforcement | |
| 10 | ------------------------------------------------------------ | |
| 11 | # Bazaar merge directive format 2 (Bazaar 0.90) | |
| 12 | # revision_id: squidadm@squid-cache.org-20170701121615-\ | |
| 13 | # ktx76udds2mzmc6c | |
| 14 | # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 | |
| 15 | # testament_sha1: d7942d1260def31f62ccc820a44bb769381beae2 | |
| 16 | # timestamp: 2017-07-01 12:32:29 +0000 | |
| 17 | # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 | |
| 18 | # base_revision_id: squid3@treenet.co.nz-20170701120848-\ | |
| 19 | # q2xznzfvxb4kwvb6 | |
| 20 | # | |
| 21 | # Begin patch | |
| 22 | === modified file 'src/client_side.cc' | |
| 23 | --- src/client_side.cc 2017-07-01 12:08:48 +0000 | |
| 24 | +++ src/client_side.cc 2017-07-01 12:16:15 +0000 | |
| 25 | @@ -5195,3 +5195,4 @@ | |
| 26 | { | |
| 27 | return os << pic.connection << ", request=" << pic.request; | |
| 28 | } | |
| 29 | + | |
| 30 |