Comment 6 for bug 1648029

Reviewed: https://review.openstack.org/408216
Committed: https://git.openstack.org/cgit/openstack/git-upstream/commit/?id=ccae7b1a63328a32afb55d2748748fb6231a3a45
Submitter: Jenkins
Branch: master

commit ccae7b1a63328a32afb55d2748748fb6231a3a45
Author: Darragh Bailey <email address hidden>
Date: Wed Dec 7 16:46:15 2016 +0000

    Handle non contributing merges where no import

    Catch a non-contributing merge of a commit where it's parent is within
    the ancestry path to the previous upstream imported.

    Add it to a list of commits to be stripped to ensure when encountered
    it is removed from being attempted to be re-played.

    Change-Id: Ibf5034a4eec5a92097cc38120959fcc12a44af74
    Related-Bug: #1648029