Permalink
Browse files

Merge branch 'cassandra-1.1' into trunk

  • Loading branch information...
jbellis committed Oct 8, 2012
2 parents ee5aafe + 5b5b20a commit 9a0d9e5862e0d4431c317782c1e5f55a99f2012d
Showing with 2 additions and 1 deletion.
  1. +1 −1 CHANGES.txt
  2. +1 −0 src/java/org/apache/cassandra/service/ClientState.java
View
@@ -1,4 +1,5 @@
1.2-beta2
+ * Add ability to use custom TServerFactory implementations (CASSANDRA-4608)
* optimize batchlog flushing to skip successful batches (CASSANDRA-4667)
* include metadata for system keyspace itself in schema tables (CASSANDRA-4416)
* add check to PropertyFileSnitch to verify presence of location for
@@ -114,7 +115,6 @@
* Backport adding AlterKeyspace statement (CASSANDRA-4611)
* (CQL3) Correcty accept upper-case data types (CASSANDRA-4770)
* Add binary protocol events for schema changes (CASSANDRA-4684)
- * Add ability to use custom TServerFactory implementations (CASSANDRA-4608)
Merged from 1.0:
* Switch from NBHM to CHM in MessagingService's callback map, which
prevents OOM in long-running instances (CASSANDRA-4708)
@@ -180,6 +180,7 @@ public void reset()
preparedTracingSession = null;
resourceClear();
prepared.clear();
+ cqlVersion = DEFAULT_CQL_VERSION;
}
public void hasKeyspaceAccess(String keyspace, Permission perm) throws UnauthorizedException, InvalidRequestException

0 comments on commit 9a0d9e5

Please sign in to comment.