------------------------------------------------------------
revno: 14089
revision-id: squidadm@squid-cache.org-20160923181424-i8cbpi71d8mz4tzo
parent: squid3@treenet.co.nz-20160923152842-wstun879sjafjg2p
committer: Source Maintenance <squidadm@squid-cache.org>
branch nick: 3.5
timestamp: Fri 2016-09-23 18:14:24 +0000
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20160923181424-\
#   i8cbpi71d8mz4tzo
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 4eaa97c34097f02baac996cedd2b2c5b4bda120e
# timestamp: 2016-09-23 18:50:59 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20160923152842-\
#   wstun879sjafjg2p
# 
# Begin patch
=== modified file 'src/HttpReply.cc'
--- src/HttpReply.cc	2016-09-23 15:28:42 +0000
+++ src/HttpReply.cc	2016-09-23 18:14:24 +0000
@@ -24,7 +24,6 @@
 #include "Store.h"
 #include "StrList.h"
 
-
 HttpReply::HttpReply() : HttpMsg(hoReply), date (0), last_modified (0),
     expires (0), surrogate_control (NULL), content_range (NULL), keep_alive (0),
     protoPrefix("HTTP/"), bodySizeMax(-2)

=== modified file 'src/Store.h'
--- src/Store.h	2016-09-23 15:28:42 +0000
+++ src/Store.h	2016-09-23 18:14:24 +0000
@@ -23,8 +23,8 @@
 #include "MemObject.h"
 #include "Range.h"
 #include "RemovalPolicy.h"
+#include "store_key_md5.h"
 #include "StoreIOBuffer.h"
-#include "store_key_md5.h"
 #include "StoreStats.h"
 
 #if USE_SQUID_ESI

=== modified file 'src/client_side_reply.cc'
--- src/client_side_reply.cc	2016-09-23 15:28:42 +0000
+++ src/client_side_reply.cc	2016-09-23 18:14:24 +0000
@@ -73,7 +73,7 @@
 }
 
 clientReplyContext::clientReplyContext(ClientHttpRequest *clientContext) : http (cbdataReference(clientContext)), old_entry (NULL), old_sc(NULL), deleting(false),
-collapsedRevalidation(crNone)
+    collapsedRevalidation(crNone)
 {}
 
 /** Create an error in the store awaiting the client side to read it.

=== modified file 'src/store_dir.cc'
--- src/store_dir.cc	2016-09-23 15:28:42 +0000
+++ src/store_dir.cc	2016-09-23 18:14:24 +0000
@@ -1365,3 +1365,4 @@
     ++bucket;
     debugs(47,3, "got entries: " << entries.size());
 }
+