Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5787bb80 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5787bb80 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5787bb80 Branch: refs/heads/trunk Commit: 5787bb80ed54da34aca0bbbaf3c016024658dc93 Parents: 706787c 050e61a Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Mar 20 18:04:25 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Mar 20 18:04:25 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/cql/UpdateStatement.java | 2 ++ .../cassandra/cql3/statements/UpdateStatement.java | 2 ++ src/java/org/apache/cassandra/db/DecoratedKey.java | 2 +- 3 files changed, 5 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
