Skip to content

Commit 122748d

Browse files
committed
Updated CHANGELOG
1 parent bff62c9 commit 122748d

1 file changed

Lines changed: 4 additions & 13 deletions

File tree

CHANGELOG.rst

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,20 @@
1-
<<<<<<< HEAD
21
4.0.0
32
=====
43

54
Features
65
--------
76
* cqlengine: asynchronous execution support (PYTHON-605)
87
* cqlengine: Makes Model._table_name_ case sensitive (PYTHON-855)
9-
10-
Other
11-
-----
12-
* Cassandra 2.0 support removal (PYTHON-716)
13-
* cqlengine: disallow Counter create, save operations (PYTHON-497)
14-
=======
15-
3.13.0
16-
======
17-
18-
Features
19-
--------
208
* cqlengine: LIKE filter operator (PYTHON-512)
219

2210
Bug Fixes
2311
---------
2412
* Support retry_policy in PreparedStatement (PYTHON-861)
2513

26-
>>>>>>> master
14+
Other
15+
-----
16+
* Cassandra 2.0 support removal (PYTHON-716)
17+
* cqlengine: disallow Counter create, save operations (PYTHON-497)
2718

2819
3.12.0
2920
======

0 commit comments

Comments
 (0)