[2/4] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2.0

2012-12-14 Thread aleksey
Merge branch 'cassandra-1.1' into cassandra-1.2.0 Conflicts: CHANGES.txt NEWS.txt build.xml debian/changelog Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ab071c50 Tree:

[2/4] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2.0

2012-11-19 Thread aleksey
Merge branch 'cassandra-1.1' into cassandra-1.2.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c00c6ab0 Tree: