You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/02/28 19:03:12 UTC

[3/7] git commit: Merge branch 'cassandra-1.1.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.1.0

Merge branch 'cassandra-1.1.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.1.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4fcb56fa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4fcb56fa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4fcb56fa

Branch: refs/heads/trunk
Commit: 4fcb56fa3a4a59937c21dc4b17ecee9e311425d2
Parents: c9270f4 40617c8
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Feb 28 18:55:01 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Feb 28 18:55:01 2012 +0100

----------------------------------------------------------------------
 examples/pig/test/populate-cli.txt                 |   18 +++++++++----
 examples/pig/test/test_storage.pig                 |   10 ++++++++
 .../apache/cassandra/db/HintedHandOffManager.java  |    2 +-
 .../cassandra/hadoop/pig/CassandraStorage.java     |   19 ++++++--------
 4 files changed, 31 insertions(+), 18 deletions(-)
----------------------------------------------------------------------