commit 15f0fafa597c40eb6dcd9948ee33048e742f6bda
Author:     Leif Hedstrom <lhedstrom@apple.com>
AuthorDate: Fri Feb 19 14:12:46 2016 -0800
Commit:     Leif Hedstrom <lhedstrom@apple.com>
CommitDate: Fri Feb 19 14:12:46 2016 -0800

    Merge conflict

commit 35d17c15f64355e3d137af473ec9ef6d085a0891
Author:     Leif Hedstrom <lhedstrom@apple.com>
AuthorDate: Fri Feb 19 14:08:10 2016 -0800
Commit:     Leif Hedstrom <lhedstrom@apple.com>
CommitDate: Fri Feb 19 14:08:10 2016 -0800

    Revert "Correctly mark the file update as inactive once the swap has been completed"

    This reverts commit 20eaf0e4cd6e1ea30df5f6099198ee167eed5984.

commit a7e2f58c149e1615465c0572a7bff7b58145d730
Author:     Leif Hedstrom <lhedstrom@apple.com>
AuthorDate: Fri Feb 19 14:07:52 2016 -0800
Commit:     Leif Hedstrom <lhedstrom@apple.com>
CommitDate: Fri Feb 19 14:07:52 2016 -0800

    Revert "Allow for loopback addresses in a hosts file"

    This reverts commit 0c030e25290dc10a8193b4e605ce884caed97ae6.

commit d9060b7b8d2100c0da4be9c129abc9c859de8c75
Author:     Leif Hedstrom <lhedstrom@apple.com>
AuthorDate: Fri Feb 19 14:07:12 2016 -0800
Commit:     Leif Hedstrom <lhedstrom@apple.com>
CommitDate: Fri Feb 19 14:07:12 2016 -0800

    Merge conflicts

commit 14facaca97063f84cd5dac687cbac010fb325ad3
Author:     Leif Hedstrom <lhedstrom@apple.com>
AuthorDate: Fri Feb 19 14:04:36 2016 -0800
Commit:     Leif Hedstrom <lhedstrom@apple.com>
CommitDate: Fri Feb 19 14:04:36 2016 -0800

    Revert "HostDB HTTP UI: Add a listall endpoint. This closes #240"

    This reverts commit 94f4083d02c545275177718a9a6c239de78ce978.

commit 05c66d25654c0f82f63975edf5f466bfcba0bef1
Author:     Leif Hedstrom <lhedstrom@apple.com>
AuthorDate: Fri Feb 19 14:04:30 2016 -0800
Commit:     Leif Hedstrom <lhedstrom@apple.com>
CommitDate: Fri Feb 19 14:04:30 2016 -0800

    Revert "HostDB HTTP UI: Fix merge issue. This closes #240"

    This reverts commit 3c2f63faf03b7a2ddd7a73542944e9c21caf2227.

commit 84293fdc7c3a71536620fb357115021c317e744e
Author:     Leif Hedstrom <lhedstrom@apple.com>
AuthorDate: Fri Feb 19 14:04:23 2016 -0800
Commit:     Leif Hedstrom <lhedstrom@apple.com>
CommitDate: Fri Feb 19 14:04:23 2016 -0800

    Revert "HostDB HTTP UI: Fix merge issue. This closes #240"

    This reverts commit 5a5311bca4f9acaab2a2a286fe635047bf5ae746.

commit 41a7ab2fca0cb07e46027c67391180b22ddee675
Author:     Leif Hedstrom <lhedstrom@apple.com>
AuthorDate: Fri Feb 19 14:04:16 2016 -0800
Commit:     Leif Hedstrom <lhedstrom@apple.com>
CommitDate: Fri Feb 19 14:04:16 2016 -0800

    Revert "clang-format ... Also, why was there no Jira with these changes?"

    This reverts commit a7a95706f7ac242d09bd14396c6f02ee83b85d2e.

commit 1e8930c3b512c934d0a8009aef7dbed6bc6b1733
Author:     Leif Hedstrom <lhedstrom@apple.com>
AuthorDate: Fri Feb 19 14:03:52 2016 -0800
Commit:     Leif Hedstrom <lhedstrom@apple.com>
CommitDate: Fri Feb 19 14:03:52 2016 -0800

    Merge COnflicts

commit 0b6d9c1e15cae0ce51b7ee997d971a00232eaac8
Author:     Leif Hedstrom <lhedstrom@apple.com>
AuthorDate: Fri Feb 19 13:58:57 2016 -0800
Commit:     Leif Hedstrom <lhedstrom@apple.com>
CommitDate: Fri Feb 19 13:58:57 2016 -0800

    Revert "TS-3773: HostDB view all: add more detail for RR records"

    This reverts commit 08b5af2f89f4b05bca7a0b59076eae1c8894e163.

commit 110f7c1d5e54b1275591fe540b9b883920174a24
Author:     Leif Hedstrom <lhedstrom@apple.com>
AuthorDate: Fri Feb 19 13:58:48 2016 -0800
Commit:     Leif Hedstrom <lhedstrom@apple.com>
CommitDate: Fri Feb 19 13:58:48 2016 -0800

    Revert "TS-3773 clang-format"

    This reverts commit 2791665b106e2afb4693faeb31ab992babceb559.

commit 768d19f45481e851ec36fc60377518315afefcac
Author:     Leif Hedstrom <lhedstrom@apple.com>
AuthorDate: Fri Feb 19 13:58:40 2016 -0800
Commit:     Leif Hedstrom <lhedstrom@apple.com>
CommitDate: Fri Feb 19 13:58:40 2016 -0800

    Revert "TS-3774: Fix memory leak issue in host file parsing for HostDB."

    This reverts commit c36204d5abaf3d4c335dd885ace1e5d58b57d451.

commit 184114d8ed73b3cb004d5d0fa642683c125f1df2
Author:     Leif Hedstrom <lhedstrom@apple.com>
AuthorDate: Fri Feb 19 13:58:31 2016 -0800
Commit:     Leif Hedstrom <lhedstrom@apple.com>
CommitDate: Fri Feb 19 13:58:31 2016 -0800

    Revert "TS-3774 clang-format"

    This reverts commit 5ae63a109255adccadddf0e726f20d657b2ac0c0.

commit 8536c1f0c95aa2e031f503dc61c5ea01272556ce
Author:     Leif Hedstrom <lhedstrom@apple.com>
AuthorDate: Fri Feb 19 13:48:14 2016 -0800
Commit:     Leif Hedstrom <lhedstrom@apple.com>
CommitDate: Fri Feb 19 13:48:14 2016 -0800

    Revert "TS-3800: HostDB UI: support json output, improve srv records, add hostnames"

    This reverts commit 0e703e1e3b7198f5c4b0648971fd35d56421e4fd.

commit 839a02b56a7a20b698a0847431f16e7269ee56f6
Author:     Leif Hedstrom <lhedstrom@apple.com>
AuthorDate: Fri Feb 19 13:48:00 2016 -0800
Commit:     Leif Hedstrom <lhedstrom@apple.com>
CommitDate: Fri Feb 19 13:48:00 2016 -0800

    Revert "TS-3803: CID 1313322 CID 1313322: HostDB memory issues (introduced in TS-3800)"

    This reverts commit 0cd1ef3ed5e4e6e3a332bccdd07220be717f2226.

commit 8d0cb0911bda888223790643c0d8735257ccf6cc
Author:     Leif Hedstrom <lhedstrom@apple.com>
AuthorDate: Fri Feb 19 13:47:52 2016 -0800
Commit:     Leif Hedstrom <lhedstrom@apple.com>
CommitDate: Fri Feb 19 13:47:52 2016 -0800

    Revert "TS-3800: Fix bug in hostdb ui related to missing query"

    This reverts commit fc133036c2e4a6cd8d95c9432cd62e703a3303b1.

commit 587c6b7296b96e4bdb08fc6c82f1e9e11cddfb46
Author:     Leif Hedstrom <lhedstrom@apple.com>
AuthorDate: Fri Feb 19 13:47:43 2016 -0800
Commit:     Leif Hedstrom <lhedstrom@apple.com>
CommitDate: Fri Feb 19 13:47:43 2016 -0800

    Revert "TS-3942: Crash when enumerating HostDB records in HostDB UI"

    This reverts commit 89606cb540b026cc238adf78f393221335d69599.