Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7a932c5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7a932c5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7a932c5 Branch: refs/heads/trunk Commit: c7a932c57add10c7c455fb2b87d86f74b4e0cd3d Parents: 07893d7 6826888 Author: Tyler Hobbs <[email protected]> Authored: Fri Nov 21 13:26:27 2014 -0600 Committer: Tyler Hobbs <[email protected]> Committed: Fri Nov 21 13:26:27 2014 -0600 ---------------------------------------------------------------------- .../cassandra/cql3/statements/UpdateStatement.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7a932c5/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java ----------------------------------------------------------------------
