You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2012/02/09 14:40:09 UTC

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

Updated Branches:
  refs/heads/trunk 778525b62 -> 819a74d8a


Merge branch 'cassandra-1.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/819a74d8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/819a74d8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/819a74d8

Branch: refs/heads/trunk
Commit: 819a74d8a5cd0542cdecc25324606cd8ed783bab
Parents: 778525b 0183dc0
Author: Brandon Williams <br...@apache.org>
Authored: Thu Feb 9 07:30:06 2012 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Feb 9 07:30:06 2012 -0600

----------------------------------------------------------------------
 .../cassandra/cql3/statements/SelectStatement.java |    2 +-
 src/java/org/apache/cassandra/gms/Gossiper.java    |    2 +-
 .../cassandra/hadoop/pig/CassandraStorage.java     |    3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/819a74d8/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
----------------------------------------------------------------------