[lxc-devel] [lxc/lxc] a1ca5d: Revert "rbd: rework rbd storage driver"

Tue Aug 15 19:28:00 UTC 2017

  Branch: refs/heads/stable-2.0
  Home:   https://github.com/lxc/lxc
  Commit: a1ca5dd7896826a33017e80bd8cbc2e19565d136
      https://github.com/lxc/lxc/commit/a1ca5dd7896826a33017e80bd8cbc2e19565d136
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/lxcrbd.c

  Log Message:
  -----------
  Revert "rbd: rework rbd storage driver"

This reverts commit 93b8f59a889d72b863c9fd225ebe3694feb6a0d1.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: c476a797525efb1dfb35f5217026e2142b1eca69
      https://github.com/lxc/lxc/commit/c476a797525efb1dfb35f5217026e2142b1eca69
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/lxcrbd.c

  Log Message:
  -----------
  Revert "rbd: rbd non-functional changes"

This reverts commit 162a857a5811ff343146401cf6dde482158ae665.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: c0ef7c0f7e8159919192aa8718120c14ee04a30d
      https://github.com/lxc/lxc/commit/c0ef7c0f7e8159919192aa8718120c14ee04a30d
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/lxcloop.c

  Log Message:
  -----------
  Revert "loop: rework loop storage driver"

This reverts commit 85914b6775afbf5598ea0cf8e342237f1da7c6d4.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 97f208bc383df649a4e1608d401069dd1c2df49d
      https://github.com/lxc/lxc/commit/97f208bc383df649a4e1608d401069dd1c2df49d
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/lxcbtrfs.c

  Log Message:
  -----------
  Revert "btrfs: switch to new rsync helpers"

This reverts commit d8bb582ae3ffd1864f20bd0a9548b2a06ded66c0.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: b73513b8b9ca220a031a896860890217ad01dc93
      https://github.com/lxc/lxc/commit/b73513b8b9ca220a031a896860890217ad01dc93
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/bdev.c

  Log Message:
  -----------
  Revert "storage: switch to new rsync functions"

This reverts commit a493a694166e65edbf412433a605042cc0ac3d0e.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: bafd3a1fe0aaeed550fd8d4a3729ee0a3a4d5d7b
      https://github.com/lxc/lxc/commit/bafd3a1fe0aaeed550fd8d4a3729ee0a3a4d5d7b
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/lxcrsync.c
    M src/lxc/bdev/lxcrsync.h

  Log Message:
  -----------
  Revert "rsync: add new rsync functions"

This reverts commit 2ea2f3c8a6509cddbeebab92a0d3c56d4bf48be9.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 01f8fa2f5bc927bcc6eb771727d86b1973be052e
      https://github.com/lxc/lxc/commit/01f8fa2f5bc927bcc6eb771727d86b1973be052e
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/bdev.c

  Log Message:
  -----------
  Revert "bdev: non-functional changes"

This reverts commit 8608cb0bd3b4ecd8bdf57a397b43ee9f344b8870.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: b70ffc20ecb8a901644cb294bbe2ae8b1bbc0f99
      https://github.com/lxc/lxc/commit/b70ffc20ecb8a901644cb294bbe2ae8b1bbc0f99
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/lxcdir.c

  Log Message:
  -----------
  Revert "dir: improvements"

This reverts commit 23eb8575d414d8b448398e9ed45d83741296a1ca.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 115dd89d96966730f21569462e9440311a78080e
      https://github.com/lxc/lxc/commit/115dd89d96966730f21569462e9440311a78080e
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/lxcdir.c

  Log Message:
  -----------
  Revert "dir: non-functional changes"

This reverts commit 8f2896da31e7822eb7894a5ade9e11652fe75f7f.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: c5365519441807193c735c1a4b55277b9ce6f53e
      https://github.com/lxc/lxc/commit/c5365519441807193c735c1a4b55277b9ce6f53e
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/bdev.c
    M src/lxc/bdev/lxclvm.c
    M src/lxc/bdev/lxclvm.h

  Log Message:
  -----------
  Revert "storage: rework lvm backend"

This reverts commit 9a534c222664cb3b2705fcf523d67de8522011d1.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 8cc69880f144fab7c4d7dd7ece1e36156524f8f5
      https://github.com/lxc/lxc/commit/8cc69880f144fab7c4d7dd7ece1e36156524f8f5
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/bdev.c
    M src/lxc/bdev/bdev.h
    M src/lxc/bdev/lxcbtrfs.c
    M src/lxc/bdev/lxcbtrfs.h

  Log Message:
  -----------
  Revert "storage: add arg to create_snapshot()"

This reverts commit a3e85dae4e02ad9d3b8fcf6bf301907ef55a7c01.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 32bd1a66359d6227d0379fd54ca4c29a466e1da6
      https://github.com/lxc/lxc/commit/32bd1a66359d6227d0379fd54ca4c29a466e1da6
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/bdev.c
    M src/lxc/bdev/lxcbtrfs.c
    M src/lxc/bdev/lxcbtrfs.h

  Log Message:
  -----------
  Revert "btrfs: switch to btrfs_create_{clone,snapshot}()"

This reverts commit 618b655b4ed187b4853841813f9831b85987339a.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 404214017e61dfb1592a6032ee7303b14b4ecdf0
      https://github.com/lxc/lxc/commit/404214017e61dfb1592a6032ee7303b14b4ecdf0
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/bdev.c
    M src/lxc/bdev/bdev.h

  Log Message:
  -----------
  Revert "storage: add create_{clone,snapshot}()"

This reverts commit 667fa8cef1afc88bbe20c04523521556cb2946ac.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 97788c7295f8602f8c6d847899cae118a439075e
      https://github.com/lxc/lxc/commit/97788c7295f8602f8c6d847899cae118a439075e
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/bdev.c

  Log Message:
  -----------
  Revert "btrfs: simplify"

This reverts commit 36c55bf31c67d5048b6dd7f85ac425f3b2e22fd3.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: d27bcc36bf24f5f273ee27a07d41b07361f8c77e
      https://github.com/lxc/lxc/commit/d27bcc36bf24f5f273ee27a07d41b07361f8c77e
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/bdev.c
    M src/lxc/bdev/lxcbtrfs.c

  Log Message:
  -----------
  Revert "btrfs: simplify"

This reverts commit 1aa0201f1446f1387c649467d86e923c9e9ecccf.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 24e0a4f0013af18b4e910e236598f1a24ad6bbd5
      https://github.com/lxc/lxc/commit/24e0a4f0013af18b4e910e236598f1a24ad6bbd5
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/bdev.c

  Log Message:
  -----------
  Revert "btrfs: only chown_mapped_root() if not btrfs"

This reverts commit d848b631492434985ffc5de9bbd7c631101077cb.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 05ed3a82096b58e07d440f94188baf8c14a8f785
      https://github.com/lxc/lxc/commit/05ed3a82096b58e07d440f94188baf8c14a8f785
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/bdev.c

  Log Message:
  -----------
  Revert "btrfs: non-functional changes"

This reverts commit 8e295bc1a95441ddcf5290153322b8ca78971d8f.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 8cc9f7a4438bdef22a961dba535cca66e6be01c2
      https://github.com/lxc/lxc/commit/8cc9f7a4438bdef22a961dba535cca66e6be01c2
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/bdev.c

  Log Message:
  -----------
  Revert "btrfs: enable unprivileged snapshots"

This reverts commit 2d66f57109b542b7a7a4882db74658374d2b5745.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 50da1a32a504735fca6a38dafd5ec527b98097bc
      https://github.com/lxc/lxc/commit/50da1a32a504735fca6a38dafd5ec527b98097bc
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/lxcbtrfs.c
    M src/lxc/bdev/lxcbtrfs.h

  Log Message:
  -----------
  Revert "btrfs: export btrfs_snapshot_wrapper()"

This reverts commit 707f3fff59abe5db1033b4676e0063b35cfedd7b.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 75ffcb1b7bca04c915f7febfc79093915eb0251e
      https://github.com/lxc/lxc/commit/75ffcb1b7bca04c915f7febfc79093915eb0251e
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/lxcbtrfs.c

  Log Message:
  -----------
  Revert "btrfs: non-functional changes"

This reverts commit fb49a3cbebd4cf6433517f8550528ecf2a8aceb9.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 16811e0b910d851cc851a1149c884ac4176635d1
      https://github.com/lxc/lxc/commit/16811e0b910d851cc851a1149c884ac4176635d1
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/tools/lxc_destroy.c

  Log Message:
  -----------
  Revert "tools: remove empty snap directory"

This reverts commit d51915386e22a19da131a578330ab1115905c326.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 69dd163651013a5e6ec1b71e0032b6bbe64a29f8
      https://github.com/lxc/lxc/commit/69dd163651013a5e6ec1b71e0032b6bbe64a29f8
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/bdev.c
    M src/lxc/bdev/lxcoverlay.c
    M src/lxc/bdev/lxcoverlay.h
    M src/lxc/bdev/storage_utils.c
    M src/lxc/conf.c
    M src/lxc/lxccontainer.c

  Log Message:
  -----------
  Revert "overlay: simplify and adapt to "overlay""

This reverts commit 7f79cc4c3457459dc20c4e40398395c5150618a9.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 9fd06d762a48bce8804f40f8dbf05436c8349244
      https://github.com/lxc/lxc/commit/9fd06d762a48bce8804f40f8dbf05436c8349244
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/lxclvm.c

  Log Message:
  -----------
  Revert "lvm: non-functional changes"

This reverts commit 7a8d7de2476b61005d80503ab8c816809bbc2d89.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: d8b94f1b0d6e549947a1864f430568f691f81480
      https://github.com/lxc/lxc/commit/d8b94f1b0d6e549947a1864f430568f691f81480
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/bdev.c
    M src/lxc/bdev/lxcbtrfs.c

  Log Message:
  -----------
  Revert "btrfs: simplify + bugfix"

This reverts commit 874a329ca6fd92057a3d243bfa6200906051393a.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 4e30cce1002919f53d13cfc6d76010439fb6c25b
      https://github.com/lxc/lxc/commit/4e30cce1002919f53d13cfc6d76010439fb6c25b
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/lxcoverlay.c

  Log Message:
  -----------
  Revert "storage: handle prefixed rootfs paths"

This reverts commit 84ae4b69653268029206317aabd5aaefa1f6a590.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: efb10596d3a8c4adf3b995818213b6f3a72e4750
      https://github.com/lxc/lxc/commit/efb10596d3a8c4adf3b995818213b6f3a72e4750
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/lxczfs.c

  Log Message:
  -----------
  Revert "storage: prefix all zfs paths"

This reverts commit aa7802e1095d19388b7b406c03e91a73d53a0b42.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 3e3f27304bd2f8edf82bc2b9e5b50bf7d40ad67a
      https://github.com/lxc/lxc/commit/3e3f27304bd2f8edf82bc2b9e5b50bf7d40ad67a
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/lxcrbd.c

  Log Message:
  -----------
  Revert "storage: prefix all rbd paths"

This reverts commit 2e0e18cca610359ae132452bc3b190f3d0335688.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: be2c50db84200966ce0f516c1f52e9181865ff1b
      https://github.com/lxc/lxc/commit/be2c50db84200966ce0f516c1f52e9181865ff1b
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/lxcnbd.c

  Log Message:
  -----------
  Revert "storage: prefix all nbd paths"

This reverts commit bdca6500054d3df9f704bcc5fe5d66f3837cce1b.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 77856e4289f8c41cac4dea34a560c98422c8a52f
      https://github.com/lxc/lxc/commit/77856e4289f8c41cac4dea34a560c98422c8a52f
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/lxclvm.c

  Log Message:
  -----------
  Revert "lvm: fix check"

This reverts commit 63539ebf3425fa62bbcfda60e7ea1bc7dedef9ef.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 77357b9778d7f7f8e3afcd837bb24ad93fc3f064
      https://github.com/lxc/lxc/commit/77357b9778d7f7f8e3afcd837bb24ad93fc3f064
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/lxclvm.c

  Log Message:
  -----------
  Revert "lvm: check whether lxc.bdev.lvm.vg is set"

This reverts commit 0790b49260cbb48833367f3357b067fb851419cc.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: d10145f93e214827906933647b005d864f3df3d2
      https://github.com/lxc/lxc/commit/d10145f93e214827906933647b005d864f3df3d2
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/lxclvm.c
    M src/lxc/bdev/storage_utils.c

  Log Message:
  -----------
  Revert "storage: prefix all lvm paths"

This reverts commit 6be74c07d0328f0d7b053524626bc83ae2b2276f.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 4f0ef0c08f90fa072d4752616ee1699d44fbad40
      https://github.com/lxc/lxc/commit/4f0ef0c08f90fa072d4752616ee1699d44fbad40
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/lxcbtrfs.c

  Log Message:
  -----------
  Revert "storage: prefix all btrfs paths"

This reverts commit f405c0c5cadbadf5b0beb42a346ca52f593777d3.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 58ade85bbec19996748b2e4e9a16d8d721dfe0d6
      https://github.com/lxc/lxc/commit/58ade85bbec19996748b2e4e9a16d8d721dfe0d6
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/bdev.c
    M src/lxc/bdev/bdev.h

  Log Message:
  -----------
  Revert "storage: add lxc_storage_get_path()"

This reverts commit ef72d7d681c49c008bf9da2522c7ef436cf78f46.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 2cda3803d1641f00047132f8aa745f664a89e551
      https://github.com/lxc/lxc/commit/2cda3803d1641f00047132f8aa745f664a89e551
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/bdev.c
    M src/lxc/bdev/lxcdir.c
    M src/lxc/bdev/lxcrsync.c
    M src/lxc/lxccontainer.c

  Log Message:
  -----------
  Revert "storage: prefix all dir paths"

This reverts commit 276fb978ee319c690e6c9ce9df16fb7a21953d2d.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 7d3391cbaff5f5da4100a34a70830ea8f60a6e70
      https://github.com/lxc/lxc/commit/7d3391cbaff5f5da4100a34a70830ea8f60a6e70
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/bdev.c

  Log Message:
  -----------
  storage: handle overlay for stable 2.0

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

  Commit: 789edffe0f9d3244bfe96d9ca3dd90ab40382c09
      https://github.com/lxc/lxc/commit/789edffe0f9d3244bfe96d9ca3dd90ab40382c09
  Author: Stéphane Graber <stgraber at stgraber.org>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M src/lxc/bdev/bdev.c
    M src/lxc/bdev/bdev.h
    M src/lxc/bdev/lxcbtrfs.c
    M src/lxc/bdev/lxcbtrfs.h
    M src/lxc/bdev/lxcdir.c
    M src/lxc/bdev/lxcloop.c
    M src/lxc/bdev/lxclvm.c
    M src/lxc/bdev/lxclvm.h
    M src/lxc/bdev/lxcnbd.c
    M src/lxc/bdev/lxcoverlay.c
    M src/lxc/bdev/lxcoverlay.h
    M src/lxc/bdev/lxcrbd.c
    M src/lxc/bdev/lxcrsync.c
    M src/lxc/bdev/lxcrsync.h
    M src/lxc/bdev/lxczfs.c
    M src/lxc/bdev/storage_utils.c
    M src/lxc/conf.c
    M src/lxc/lxccontainer.c
    M src/lxc/tools/lxc_destroy.c

  Log Message:
  -----------
  Merge pull request #1747 from brauner/2017-08-15/stable_2_0_cherry_picks

stable 2.0: revert a bunch of cherry picks

Compare: https://github.com/lxc/lxc/compare/93b8f59a889d...789edffe0f9d