You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@kafka.apache.org by mj...@apache.org on 2019/06/14 15:39:48 UTC

[kafka] branch 2.2 updated: MINOR: Fix merge conflict in version.py (#6931)

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

mjsax pushed a commit to branch 2.2
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/2.2 by this push:
     new d797428  MINOR: Fix merge conflict in version.py (#6931)
d797428 is described below

commit d797428cd061710a305e30e0835f09c9cc0bdaa2
Author: Stanislav Kozlovski <fa...@windowslive.com>
AuthorDate: Fri Jun 14 18:39:34 2019 +0300

    MINOR: Fix merge conflict in version.py (#6931)
    
    Fix a regression introduced in commit c450bfc2911fa121e18815a15b5fd7f087fd03ac
    
    Reviewers: Ismael Juma <is...@confluent.io>, Matthias J. Sax <ma...@confluent.io>
---
 tests/kafkatest/version.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/kafkatest/version.py b/tests/kafkatest/version.py
index 5daa9c6..715ab6e 100644
--- a/tests/kafkatest/version.py
+++ b/tests/kafkatest/version.py
@@ -122,4 +122,3 @@ LATEST_2_1 = V_2_1_1
 # 2.2.x versions
 V_2_2_0 = KafkaVersion("2.2.0")
 LATEST_2_2 = V_2_2_0
->>>>>>> 55bfea137...  KAFKA-8155: Add 2.1.1 release to system tests (#6596)