------------------------------------------------------------ revno: 10685 revision-id: squidadm@squid-cache.org-20100730131630-h8rqx3xdymjaughd parent: amosjeffries@squid-cache.org-20100730084353-arhabj6wek640mji committer: Automatic source maintenance branch nick: trunk timestamp: Fri 2010-07-30 07:16:30 -0600 message: snapshot 3.2 ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squidadm@squid-cache.org-20100730131630-\ # h8rqx3xdymjaughd # target_branch: http://www.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: bd931e7fd71cbd67d97a26c8448fd949b0d554a3 # timestamp: 2010-07-30 13:17:16 +0000 # source_branch: http://www.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: amosjeffries@squid-cache.org-20100730084353-\ # arhabj6wek640mji # # Begin patch === modified file 'mksnapshot-cron.sh' --- mksnapshot-cron.sh 2010-07-14 12:08:16 +0000 +++ mksnapshot-cron.sh 2010-07-30 13:16:30 +0000 @@ -109,6 +109,9 @@ chmod 444 /server/httpd/htdocs/squid-cache.org/SPONSORS.new mv -f /server/httpd/htdocs/squid-cache.org/SPONSORS.new /server/httpd/htdocs/squid-cache.org/content/SPONSORS.txt +../commit/bootstrap squid-3.2 +make_snapshot ../commit/squid-3/mksnapshot.sh branches/SQUID_3_2 v3 3.2 5 + ../commit/bootstrap squid-3.1 make_snapshot ../commit/squid-3/mksnapshot.sh branches/SQUID_3_1 v3 3.1 3