Updated Branches: refs/heads/cassandra-1.1 0906b7cc5 -> 0d2410e78 refs/heads/cassandra-1.2 1c2a69c35 -> 94f0b8568 refs/heads/trunk c7366c508 -> 958ba2ba0
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/958ba2ba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/958ba2ba Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/958ba2ba Branch: refs/heads/trunk Commit: 958ba2ba0fd217b3b046b9922489177e30b81a9a Parents: c7366c5 94f0b85 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Jan 9 16:44:25 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Jan 9 16:44:25 2013 -0600 ---------------------------------------------------------------------- .../apache/cassandra/thrift/ThriftValidation.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/958ba2ba/src/java/org/apache/cassandra/thrift/ThriftValidation.java ----------------------------------------------------------------------
