Updated Branches: refs/heads/trunk 7049ab44d -> 22609801d
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/22609801 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/22609801 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/22609801 Branch: refs/heads/trunk Commit: 22609801d9bb03b768912cae8800411054ce6150 Parents: 7049ab4 0d30c8c Author: Dave Brosius <[email protected]> Authored: Fri Feb 15 00:30:04 2013 -0500 Committer: Dave Brosius <[email protected]> Committed: Fri Feb 15 00:30:04 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/Operation.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
