Skip to content

Commit

Permalink
Merge branch 'cassandra-1.2' into trunk
Browse files Browse the repository at this point in the history 
Conflicts:
	interface/thrift/gen-java/org/apache/cassandra/thrift/cassandraConstants.java
  • Loading branch information
@iamaleksey
iamaleksey committed May 5, 2013
2 parents 5b0ec50 + 0637b86 commit 2c12460
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 2c12460

Please sign in to comment.