[airflow] branch v1-10-test updated (6e364fc -> 9b909b7)

[ka...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kaxilnaik pushed a change to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git.


 discard 6e364fc  fixup! Replace pkg_resources with importlib.metadata to avoid VersionConflict errors (#12694)
 discard 6221f30  Add missing coma in setup.py (#12790)
 discard ee2f227  Add Changelog for 1.10.14
 discard d977b08  Replace pkg_resources with importlib.metadata to avoid VersionConflict errors (#12694)
     add b49838f  Replace pkg_resources with importlib.metadata to avoid VersionConflict errors (#12694)
     add 0ce9e18  Add missing coma in setup.py (#12790)
     add 9b909b7  Add Changelog for 1.10.14

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (6e364fc)
            \
             N -- N -- N   refs/heads/v1-10-test (9b909b7)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 CHANGELOG.txt                              | 3 ++-
 tests/plugins/test_plugins_manager_rbac.py | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)