cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Thu, 02 Jan 2014 13:18:40 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/service/ClientState.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5284e129
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5284e129
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5284e129

Branch: refs/heads/cassandra-2.0
Commit: 5284e129f65ed737897e06af1d79cc6ce9bc4645
Parents: 4ed2234 7171b7a
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Thu Jan 2 14:18:29 2014 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Thu Jan 2 14:18:29 2014 +0100

----------------------------------------------------------------------
 CHANGES.txt                                            | 1 +
 src/java/org/apache/cassandra/service/ClientState.java | 2 ++
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5284e129/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 958369a,64146c1..7946927
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,15 +1,31 @@@
 -1.2.14
 - * Allow executing CREATE statements multiple times (CASSANDRA-6471)
 - * Don't send confusing info with timeouts (CASSANDRA-6491)
 - * Don't resubmit counter mutation runnables internally (CASSANDRA-6427)
 - * Don't drop local mutations without a trace (CASSANDRA-6510)
 - * Don't allow null max_hint_window_in_ms (CASSANDRA-6419)
 - * Validate SliceRange start and finish lengths (CASSANDRA-6521)
 +2.0.5
 +* Delete unfinished compaction incrementally (CASSANDRA-6086)
 +Merged from 1.2:
   * fsync compression metadata (CASSANDRA-6531)
+  * Validate CF existence on execution for prepared statement (CASSANDRA-6535)
  
  
 -1.2.13
 +2.0.4
 + * Allow removing snapshots of no-longer-existing CFs (CASSANDRA-6418)
 + * add StorageService.stopDaemon() (CASSANDRA-4268)
 + * add IRE for invalid CF supplied to get_count (CASSANDRA-5701)
 + * add client encryption support to sstableloader (CASSANDRA-6378)
 + * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468)
 + * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496)
 + * Fix assertion failure in filterColdSSTables (CASSANDRA-6483)
 + * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008)
 + * Fix cleanup ClassCastException (CASSANDRA-6462)
 + * Reduce gossip memory use by interning VersionedValue strings (CASSANDRA-6410)
 + * Allow specifying datacenters to participate in a repair (CASSANDRA-6218)
 + * Fix divide-by-zero in PCI (CASSANDRA-6403)
 + * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
 + * Add millisecond precision formats to the timestamp parser (CASSANDRA-6395)
 + * Expose a total memtable size metric for a CF (CASSANDRA-6391)
 + * cqlsh: handle symlinks properly (CASSANDRA-6425)
 + * Fix potential infinite loop when paging query with IN (CASSANDRA-6464)
 + * Fix assertion error in AbstractQueryPager.discardFirst (CASSANDRA-6447)
 + * Fix streaming older SSTable yields unnecessary tombstones (CASSANDRA-6527)
 +Merged from 1.2:
   * Improved error message on bad properties in DDL queries (CASSANDRA-6453)
   * Randomize batchlog candidates selection (CASSANDRA-6481)
   * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345, 6485)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5284e129/src/java/org/apache/cassandra/service/ClientState.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/ClientState.java
index 472fe53,87ccfda..7f312a9
--- a/src/java/org/apache/cassandra/service/ClientState.java
+++ b/src/java/org/apache/cassandra/service/ClientState.java
@@@ -36,7 -36,7 +36,8 @@@ import org.apache.cassandra.db.SystemKe
  import org.apache.cassandra.exceptions.AuthenticationException;
  import org.apache.cassandra.exceptions.InvalidRequestException;
  import org.apache.cassandra.exceptions.UnauthorizedException;
 +import org.apache.cassandra.tracing.Tracing;
+ import org.apache.cassandra.thrift.ThriftValidation;
  import org.apache.cassandra.utils.Pair;
  import org.apache.cassandra.utils.SemanticVersion;
  


Mime
View raw message