0000000000000000000000000000000000000000 bc4b0efc22d8f45dff44424c070cb037f6e19c90 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903102 +0100	checkout: moving from master to ubuntu/devel
bc4b0efc22d8f45dff44424c070cb037f6e19c90 bc4b0efc22d8f45dff44424c070cb037f6e19c90 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903288 +0100	checkout: moving from ubuntu/devel to lp-1855490-revert-default-path-focal
bc4b0efc22d8f45dff44424c070cb037f6e19c90 bc4b0efc22d8f45dff44424c070cb037f6e19c90 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903304 +0100	rebase -i (start): checkout pkg/debian/sid
bc4b0efc22d8f45dff44424c070cb037f6e19c90 bc4b0efc22d8f45dff44424c070cb037f6e19c90 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903304 +0100	rebase -i (finish): returning to refs/heads/lp-1855490-revert-default-path-focal
bc4b0efc22d8f45dff44424c070cb037f6e19c90 5c49ea217cbf69336a1d700da59e66a8a80d9173 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903308 +0100	rebase -i (start): checkout pkg/debian/sid
5c49ea217cbf69336a1d700da59e66a8a80d9173 44b048d1af79661b17c1f3e940ecbe8af704bee3 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903308 +0100	rebase -i: fast-forward
44b048d1af79661b17c1f3e940ecbe8af704bee3 5c49ea217cbf69336a1d700da59e66a8a80d9173 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903310 +0100	reset: moving to HEAD^
5c49ea217cbf69336a1d700da59e66a8a80d9173 e18bf2c1f513571f5ded6750af194436ca197640 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903416 +0100	commit: d/tftpd-hpa.postinst, d/tftpd-hpa.templates, d/po/*: Default to listening on both IPv4 and IPv6.
e18bf2c1f513571f5ded6750af194436ca197640 1778117d2d00b284fb147b8e2bb5b2d6a1896338 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903438 +0100	commit: d/tftpd-hpa.postinst, d/tftpd-hpa.templates, d/po/*: Default to listening on both IPv4 and IPv6. MERGE
1778117d2d00b284fb147b8e2bb5b2d6a1896338 6fed5d53aa3111ba2558973ba31703a43a961933 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903466 +0100	commit: debian/tftpd-hpa.postinst: Add -s to /etc/default/tftpd-hpa
6fed5d53aa3111ba2558973ba31703a43a961933 6eef502d6bd9dc0b8984963b7a739c8c6a3db8ed Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903499 +0100	commit: debian/tftpd-hpa.templates: Set /var/lib/tftpboot by default instead of /srv/tftp.
6eef502d6bd9dc0b8984963b7a739c8c6a3db8ed 143d0ab1946a5c1d519ffb20c0b5f988d78891d5 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903510 +0100	commit: update-maintainer
143d0ab1946a5c1d519ffb20c0b5f988d78891d5 24ec7197e4ba2f8eb086a9e3b2ac561b0dae91a2 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903528 +0100	commit: changelog: 5.2+20150808-1ubuntu1
24ec7197e4ba2f8eb086a9e3b2ac561b0dae91a2 80c46ee65f349216029705c1a6a7fa3e5c7650d1 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903531 +0100	rebase -i (pick): Import patches-unapplied version 5.2+20150808-1ubuntu2 to ubuntu/zesty-proposed
80c46ee65f349216029705c1a6a7fa3e5c7650d1 04b952d48f83854c0240fe256a62cb888fbd95e2 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903531 +0100	rebase -i (pick): Import patches-unapplied version 5.2+20150808-1ubuntu3 to ubuntu/zesty-proposed
04b952d48f83854c0240fe256a62cb888fbd95e2 04b952d48f83854c0240fe256a62cb888fbd95e2 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903531 +0100	rebase -i (finish): returning to refs/heads/lp-1855490-revert-default-path-focal
04b952d48f83854c0240fe256a62cb888fbd95e2 e18bf2c1f513571f5ded6750af194436ca197640 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903556 +0100	rebase -i (start): checkout pkg/debian/sid
e18bf2c1f513571f5ded6750af194436ca197640 37d9a1f9169ed544aa9125242bf51e551f65d75e Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903556 +0100	rebase -i (fixup): d/tftpd-hpa.postinst, d/tftpd-hpa.templates, d/po/*: Default to listening on both IPv4 and IPv6.
37d9a1f9169ed544aa9125242bf51e551f65d75e 893606628b4ce8d10a2a0bd6647eb74a7cf6b441 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903557 +0100	rebase -i (pick): debian/tftpd-hpa.postinst: Add -s to /etc/default/tftpd-hpa
893606628b4ce8d10a2a0bd6647eb74a7cf6b441 7f33bdf14cc51cc0a4e19ce6ab002e89c1fa2182 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903557 +0100	rebase -i (pick): debian/tftpd-hpa.templates: Set /var/lib/tftpboot by default instead of /srv/tftp.
7f33bdf14cc51cc0a4e19ce6ab002e89c1fa2182 4854d92355c150296e24d1d36880ec7d50036528 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903558 +0100	rebase -i (pick): update-maintainer
4854d92355c150296e24d1d36880ec7d50036528 630d9b9439e89b8173d865b8549f3181acbfe761 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903558 +0100	rebase -i (pick): changelog: 5.2+20150808-1ubuntu1
630d9b9439e89b8173d865b8549f3181acbfe761 a5a402583f09c2672e92510b7a0624384b1b9546 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903559 +0100	rebase -i (pick): Import patches-unapplied version 5.2+20150808-1ubuntu2 to ubuntu/zesty-proposed
a5a402583f09c2672e92510b7a0624384b1b9546 ecb101f61338dca238981050effac87588aefa69 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903559 +0100	rebase -i (pick): Import patches-unapplied version 5.2+20150808-1ubuntu3 to ubuntu/zesty-proposed
ecb101f61338dca238981050effac87588aefa69 ecb101f61338dca238981050effac87588aefa69 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903559 +0100	rebase -i (finish): returning to refs/heads/lp-1855490-revert-default-path-focal
ecb101f61338dca238981050effac87588aefa69 630d9b9439e89b8173d865b8549f3181acbfe761 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903591 +0100	rebase -i (start): checkout pkg/debian/sid
630d9b9439e89b8173d865b8549f3181acbfe761 a5a402583f09c2672e92510b7a0624384b1b9546 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903591 +0100	rebase -i: fast-forward
a5a402583f09c2672e92510b7a0624384b1b9546 630d9b9439e89b8173d865b8549f3181acbfe761 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903593 +0100	reset: moving to HEAD^
630d9b9439e89b8173d865b8549f3181acbfe761 2cf9717c5aa6ce951d85fbae8ff7740a24aa8228 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903637 +0100	commit: Replace the default value of TFTP_ADDRESS to :69 instead of [::]:69
2cf9717c5aa6ce951d85fbae8ff7740a24aa8228 6b3dc5a40bb5d694dc2117351f025011108fb659 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903651 +0100	commit: changelog: 5.2+20150808-1ubuntu2
6b3dc5a40bb5d694dc2117351f025011108fb659 5746c88cb5d57c24d2eb57e20dd30284148c0c12 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903654 +0100	rebase -i (pick): Import patches-unapplied version 5.2+20150808-1ubuntu3 to ubuntu/zesty-proposed
5746c88cb5d57c24d2eb57e20dd30284148c0c12 5746c88cb5d57c24d2eb57e20dd30284148c0c12 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903654 +0100	rebase -i (finish): returning to refs/heads/lp-1855490-revert-default-path-focal
5746c88cb5d57c24d2eb57e20dd30284148c0c12 6b3dc5a40bb5d694dc2117351f025011108fb659 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903660 +0100	rebase -i (start): checkout pkg/debian/sid
6b3dc5a40bb5d694dc2117351f025011108fb659 5746c88cb5d57c24d2eb57e20dd30284148c0c12 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903660 +0100	rebase -i: fast-forward
5746c88cb5d57c24d2eb57e20dd30284148c0c12 6b3dc5a40bb5d694dc2117351f025011108fb659 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903662 +0100	reset: moving to HEAD^
6b3dc5a40bb5d694dc2117351f025011108fb659 bead66ddadcb231c9e45f3232790aabb171d4684 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903679 +0100	commit: d/tftpd-hpa.config : Add version guard to avoid rewriting TFTP_ADDRESS
bead66ddadcb231c9e45f3232790aabb171d4684 48416f80e88439da8982e41dcf0aa632ac0809d1 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903688 +0100	commit: changelog: 5.2+20150808-1ubuntu3
48416f80e88439da8982e41dcf0aa632ac0809d1 48416f80e88439da8982e41dcf0aa632ac0809d1 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903690 +0100	rebase -i (finish): returning to refs/heads/lp-1855490-revert-default-path-focal
48416f80e88439da8982e41dcf0aa632ac0809d1 7aac5c6e35d7332a03c3ee815f0996043e947e1a Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903759 +0100	revert: Revert "debian/tftpd-hpa.templates: Set /var/lib/tftpboot by default instead of /srv/tftp."
7aac5c6e35d7332a03c3ee815f0996043e947e1a 02110bff3aa99337274e33f466b12405cd80b177 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575903853 +0100	commit: changelog: evert the default back to /srv/tftp (LP: #1855490)
02110bff3aa99337274e33f466b12405cd80b177 7aac5c6e35d7332a03c3ee815f0996043e947e1a Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575963367 +0100	rebase -i (start): checkout paelzer/logical/5.2+20150808-1ubuntu3
7aac5c6e35d7332a03c3ee815f0996043e947e1a 02110bff3aa99337274e33f466b12405cd80b177 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575963367 +0100	rebase -i: fast-forward
02110bff3aa99337274e33f466b12405cd80b177 8b478ef6f3d3f3f182efe041c0a7eb206f4f6a4d Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575963367 +0100	rebase -i (reword): changelog: revert the default back to /srv/tftp (LP: #1855490)
8b478ef6f3d3f3f182efe041c0a7eb206f4f6a4d 8b478ef6f3d3f3f182efe041c0a7eb206f4f6a4d Christian Ehrhardt <christian.ehrhardt@canonical.com> 1575963367 +0100	rebase -i (finish): returning to refs/heads/lp-1855490-revert-default-path-focal
8b478ef6f3d3f3f182efe041c0a7eb206f4f6a4d 1ca9538000b8f154f206b26c53a297e584850216 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471108 +0200	checkout: moving from lp-1855490-revert-default-path-focal to pkg/debian/sid
1ca9538000b8f154f206b26c53a297e584850216 8f511c42c4f356f24c1a595b46d4ee3820c280b4 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471365 +0200	checkout: moving from 1ca9538000b8f154f206b26c53a297e584850216 to pkg/ubuntu/groovy-devel
8f511c42c4f356f24c1a595b46d4ee3820c280b4 0c70c7dbc17cbbf476c57a6a382f60535f9d096c Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471447 +0200	checkout: moving from 8f511c42c4f356f24c1a595b46d4ee3820c280b4 to 0c70c7dbc17cbbf476c57a6a382f60535f9d096c
0c70c7dbc17cbbf476c57a6a382f60535f9d096c 1da3ff306bd2984c0d28f9eb3ccacd685140cfe4 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471447 +0200	cherry-pick: 5.2+20150808-1ubuntu1 (patches unapplied)
1da3ff306bd2984c0d28f9eb3ccacd685140cfe4 c0b74c1e182efef96ad8261adf836c828d12cb91 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471451 +0200	cherry-pick: 5.2+20150808-1ubuntu2 (patches unapplied)
c0b74c1e182efef96ad8261adf836c828d12cb91 fbdf8d3d4c7183ea5dab1d4f55fd7a1df3834180 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471451 +0200	cherry-pick: 5.2+20150808-1ubuntu3 (patches unapplied)
fbdf8d3d4c7183ea5dab1d4f55fd7a1df3834180 1dae161d8e10b0b34ce12271e431ca753302080e Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471452 +0200	cherry-pick: 5.2+20150808-1ubuntu4 (patches unapplied)
1dae161d8e10b0b34ce12271e431ca753302080e 0c70c7dbc17cbbf476c57a6a382f60535f9d096c Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471465 +0200	rebase (start): checkout lp9999999/old/debian
0c70c7dbc17cbbf476c57a6a382f60535f9d096c 1da3ff306bd2984c0d28f9eb3ccacd685140cfe4 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471465 +0200	rebase: fast-forward
1da3ff306bd2984c0d28f9eb3ccacd685140cfe4 0c70c7dbc17cbbf476c57a6a382f60535f9d096c Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471487 +0200	reset: moving to HEAD^
0c70c7dbc17cbbf476c57a6a382f60535f9d096c 38bd9c8310c7d8c75538e061e81a174008a932f8 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471556 +0200	commit: - debian/tftpd-hpa.postinst: Add "-s" to /etc/default/tftpd-hpa
38bd9c8310c7d8c75538e061e81a174008a932f8 1dae161d8e10b0b34ce12271e431ca753302080e Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471596 +0200	rebase (abort): updating HEAD
1dae161d8e10b0b34ce12271e431ca753302080e 0c70c7dbc17cbbf476c57a6a382f60535f9d096c Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471611 +0200	rebase (start): checkout pkg/import/5.2+20150808-1
0c70c7dbc17cbbf476c57a6a382f60535f9d096c 1da3ff306bd2984c0d28f9eb3ccacd685140cfe4 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471611 +0200	rebase: fast-forward
1da3ff306bd2984c0d28f9eb3ccacd685140cfe4 0c70c7dbc17cbbf476c57a6a382f60535f9d096c Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471615 +0200	reset: moving to HEAD^
0c70c7dbc17cbbf476c57a6a382f60535f9d096c 5f798826285ec17c4a69941fe9ccf15e2a4906e5 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471628 +0200	commit: - debian/tftpd-hpa.postinst: Add "-s" to /etc/default/tftpd-hpa
5f798826285ec17c4a69941fe9ccf15e2a4906e5 4dd81d6d006dd01b5699e521069f7ee10e6c617d Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471647 +0200	commit: - Default to listening on both IPv4 and IPv6. (LP: #1228340)
4dd81d6d006dd01b5699e521069f7ee10e6c617d 0371b34e10ae8f38bef287f89c640eddf1e95c1f Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471665 +0200	commit (amend): - d/tftpd-hpa.postinst, d/tftpd-hpa.templates, d/po/*:
0371b34e10ae8f38bef287f89c640eddf1e95c1f 51038c8847320a71475d6d174a2fe3cc183db4a1 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471720 +0200	commit: M ipv6
51038c8847320a71475d6d174a2fe3cc183db4a1 1436c3626c583f9cb7cde7cb3a32bc79c33d4508 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471776 +0200	commit: - debian/tftpd-hpa.templates: Set /var/lib/tftpboot by default instead of /srv/tftp.
1436c3626c583f9cb7cde7cb3a32bc79c33d4508 cc4b4ab3a8ba6ab9fbbff39817c0c8cc6e379e57 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471791 +0200	commit: M ipv6 debian/tftpd-hpa.config
cc4b4ab3a8ba6ab9fbbff39817c0c8cc6e379e57 898b4036212fc2e78d505816cc3b46103e13f354 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471817 +0200	commit: update-maintainer
898b4036212fc2e78d505816cc3b46103e13f354 7093a89da6ed760583718146f2145f76bfdb0a8a Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471832 +0200	commit: changelog: merge CL
7093a89da6ed760583718146f2145f76bfdb0a8a 8a21df5b0ca03264576dbe3c834f3d6f0cfc0e01 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471842 +0200	rebase (continue) (pick): 5.2+20150808-1ubuntu2 (patches unapplied)
8a21df5b0ca03264576dbe3c834f3d6f0cfc0e01 1e22341ee7114a5afcd9f4d4a69a07f82a7b5897 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471842 +0200	rebase (continue) (pick): 5.2+20150808-1ubuntu3 (patches unapplied)
1e22341ee7114a5afcd9f4d4a69a07f82a7b5897 e157d158f2c54b88a805b524723fdce5599ed28d Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471843 +0200	rebase (continue) (pick): 5.2+20150808-1ubuntu4 (patches unapplied)
e157d158f2c54b88a805b524723fdce5599ed28d 0371b34e10ae8f38bef287f89c640eddf1e95c1f Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471857 +0200	rebase (start): checkout pkg/import/5.2+20150808-1
0371b34e10ae8f38bef287f89c640eddf1e95c1f 420c8455e92899aaa0a0ad4a68a5ef51dffa19fb Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471857 +0200	rebase (fixup): # This is a combination of 2 commits.
420c8455e92899aaa0a0ad4a68a5ef51dffa19fb 59aa8eb678f80be2894a17ab88ea8ee9ad36353d Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471857 +0200	rebase (squash): - d/tftpd-hpa.{postinst,templates,config}, d/po/*:
59aa8eb678f80be2894a17ab88ea8ee9ad36353d a2f87f7c48b221f7468d101ec8bbbf17ea400216 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471888 +0200	rebase (pick): - debian/tftpd-hpa.templates: Set /var/lib/tftpboot by default instead of /srv/tftp.
a2f87f7c48b221f7468d101ec8bbbf17ea400216 e8d0417d84707d50b2e17074875b0c272558df9a Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471888 +0200	rebase (pick): update-maintainer
e8d0417d84707d50b2e17074875b0c272558df9a e3629ead404f44723d90b34fc879b4914db24e8f Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471889 +0200	rebase (pick): changelog: merge CL
e3629ead404f44723d90b34fc879b4914db24e8f 17e3db7a1eb5835490f6d37d436791db73608157 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471889 +0200	rebase (pick): 5.2+20150808-1ubuntu2 (patches unapplied)
17e3db7a1eb5835490f6d37d436791db73608157 097c1f2285439bc1c60d61167ca45b0528d017dd Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471889 +0200	rebase (pick): 5.2+20150808-1ubuntu3 (patches unapplied)
097c1f2285439bc1c60d61167ca45b0528d017dd 71542fa19db91390cec0813f022bc7224c5baccb Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471890 +0200	rebase (pick): 5.2+20150808-1ubuntu4 (patches unapplied)
71542fa19db91390cec0813f022bc7224c5baccb e3629ead404f44723d90b34fc879b4914db24e8f Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471899 +0200	rebase (start): checkout pkg/import/5.2+20150808-1
e3629ead404f44723d90b34fc879b4914db24e8f 17e3db7a1eb5835490f6d37d436791db73608157 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471899 +0200	rebase: fast-forward
17e3db7a1eb5835490f6d37d436791db73608157 e3629ead404f44723d90b34fc879b4914db24e8f Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471901 +0200	reset: moving to HEAD^
e3629ead404f44723d90b34fc879b4914db24e8f 80a80f4c884d3e250e55cde3bee8ec88a54a4c84 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471969 +0200	commit: M SQUASH: ipv6 changes
80a80f4c884d3e250e55cde3bee8ec88a54a4c84 60d2ae070cf2587dbb0e7fc1ed8be3a3a1bb28ae Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471987 +0200	commit: changelog: 5.2+20150808-1ubuntu2
60d2ae070cf2587dbb0e7fc1ed8be3a3a1bb28ae 96adc01183248e1fff2da199df0e79858584a400 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471989 +0200	rebase (continue) (pick): 5.2+20150808-1ubuntu3 (patches unapplied)
96adc01183248e1fff2da199df0e79858584a400 7691a5162603d0f6d53bab1785006b01f8c85c99 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471989 +0200	rebase (continue) (pick): 5.2+20150808-1ubuntu4 (patches unapplied)
7691a5162603d0f6d53bab1785006b01f8c85c99 60d2ae070cf2587dbb0e7fc1ed8be3a3a1bb28ae Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471997 +0200	rebase (start): checkout pkg/import/5.2+20150808-1
60d2ae070cf2587dbb0e7fc1ed8be3a3a1bb28ae 96adc01183248e1fff2da199df0e79858584a400 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601471997 +0200	rebase: fast-forward
96adc01183248e1fff2da199df0e79858584a400 60d2ae070cf2587dbb0e7fc1ed8be3a3a1bb28ae Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601472000 +0200	reset: moving to HEAD^
60d2ae070cf2587dbb0e7fc1ed8be3a3a1bb28ae 7561f55b9a44a40aeb89175c0b81019bf342c2bc Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601472026 +0200	commit: M SQUASH: ipv6 changes
7561f55b9a44a40aeb89175c0b81019bf342c2bc 9bc674a290294aa7e57c008f514ac160d682afd2 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601472032 +0200	commit: changelog: 5.2+20150808-1ubuntu3
9bc674a290294aa7e57c008f514ac160d682afd2 90d31809c1fe02eb01b4a3ef8e8e1a1a00f35023 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601472036 +0200	rebase (continue) (pick): 5.2+20150808-1ubuntu4 (patches unapplied)
90d31809c1fe02eb01b4a3ef8e8e1a1a00f35023 9bc674a290294aa7e57c008f514ac160d682afd2 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601472048 +0200	rebase (start): checkout pkg/import/5.2+20150808-1
9bc674a290294aa7e57c008f514ac160d682afd2 90d31809c1fe02eb01b4a3ef8e8e1a1a00f35023 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601472048 +0200	rebase: fast-forward
90d31809c1fe02eb01b4a3ef8e8e1a1a00f35023 9bc674a290294aa7e57c008f514ac160d682afd2 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601472050 +0200	reset: moving to HEAD^
9bc674a290294aa7e57c008f514ac160d682afd2 549c43be1a9cd40ff02b0e98e7447ace84270020 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601472092 +0200	commit: SQUASH-DELETE: debian/tftpd-hpa.templates: revert the default back to /srv/tftp
549c43be1a9cd40ff02b0e98e7447ace84270020 d67922ca06fa1f0caee8ad5e53c1fea0f50afb49 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601472101 +0200	commit: changelog: 5.2+20150808-1ubuntu4
d67922ca06fa1f0caee8ad5e53c1fea0f50afb49 59aa8eb678f80be2894a17ab88ea8ee9ad36353d Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601472177 +0200	rebase (start): checkout pkg/import/5.2+20150808-1
59aa8eb678f80be2894a17ab88ea8ee9ad36353d fe002b659da4732a3501e5597ef95eca697b280e Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601472177 +0200	rebase (fixup): # This is a combination of 2 commits.
fe002b659da4732a3501e5597ef95eca697b280e f64b8c67d9fec9546889eabff949239da5058a8d Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601472178 +0200	rebase (fixup): - d/tftpd-hpa.{postinst,templates,config}, d/po/*:
f64b8c67d9fec9546889eabff949239da5058a8d 1ca9538000b8f154f206b26c53a297e584850216 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601472242 +0200	rebase (start): checkout pkg/debian/sid
1ca9538000b8f154f206b26c53a297e584850216 7197756a52805f5f74dccf3aa9c76e5787abeaa2 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601472242 +0200	rebase (pick): - debian/tftpd-hpa.postinst: Add "-s" to /etc/default/tftpd-hpa
7197756a52805f5f74dccf3aa9c76e5787abeaa2 5431bcb02c52f76db8aa56868d7ea5e74db8fa3f Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601472242 +0200	rebase (pick): - d/tftpd-hpa.{postinst,templates,config}, d/po/*:
5431bcb02c52f76db8aa56868d7ea5e74db8fa3f e707dfe77a8fea94588b67f1640dc3ab31ef185a Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601472250 +0200	commit: merge-changelogs
e707dfe77a8fea94588b67f1640dc3ab31ef185a 8a689f9da37cfc3b518792c2056cc5cb054f5247 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601472252 +0200	commit: reconstruct-changelog
8a689f9da37cfc3b518792c2056cc5cb054f5247 8fba005e95a8031eb0f7c2153876c203dba7f2bd Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601472253 +0200	commit: update-maintainer
8fba005e95a8031eb0f7c2153876c203dba7f2bd 23d5df181de563c1c05f3a1a4acff9cd0fed528e Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601472651 +0200	commit: M CL
23d5df181de563c1c05f3a1a4acff9cd0fed528e 8a689f9da37cfc3b518792c2056cc5cb054f5247 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601472666 +0200	rebase (start): checkout pkg/debian/sid
8a689f9da37cfc3b518792c2056cc5cb054f5247 24e5c427ed651d63e19556ba97c23783d96efc97 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601472666 +0200	rebase (fixup): reconstruct-changelog
24e5c427ed651d63e19556ba97c23783d96efc97 168dc3c1ae25dbb3bc0b78f640d895058dae6f13 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601472666 +0200	rebase (pick): update-maintainer
168dc3c1ae25dbb3bc0b78f640d895058dae6f13 168dc3c1ae25dbb3bc0b78f640d895058dae6f13 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601472683 +0200	checkout: moving from 168dc3c1ae25dbb3bc0b78f640d895058dae6f13 to merge-5.2+20150808-1.1ubuntu1-GROOVY
168dc3c1ae25dbb3bc0b78f640d895058dae6f13 26f09704618d00bbe9c7e3a5c5bdef1d84317677 Christian Ehrhardt <christian.ehrhardt@canonical.com> 1601622721 +0200	commit: changelog: improve bug reference
