From 0320ecbb03872578ff4536ee81732e43c4582d8f Mon Sep 17 00:00:00 2001
From: Rick Ratzel <3039903+rlratzel@users.noreply.github.com>
Date: Thu, 16 Jun 2022 12:41:39 -0400
Subject: [PATCH] Branch 22.08 merge 22.06 (#2359)

Resolves merge conflict in `CHANGELOG.md` from `branch-22.06` to `branch-22.08`

Authors:
  - Rick Ratzel (https://github.com/rlratzel)
  - Ray Douglass (https://github.com/raydouglass)

Approvers:
  - Joseph Nke (https://github.com/jnke2016)
  - Brad Rees (https://github.com/BradReesWork)

URL: https://github.com/rapidsai/cugraph/pull/2359