Updated Branches: refs/heads/trunk e7e3d3e60 -> cee521477
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/cee52147 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cee52147 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cee52147 Branch: refs/heads/trunk Commit: cee5214777d8cffc7645fe67b2a46363ba83ce3e Parents: e7e3d3e 6f148e6 Author: Dave Brosius <[email protected]> Authored: Wed Nov 14 00:33:43 2012 -0500 Committer: Dave Brosius <[email protected]> Committed: Wed Nov 14 00:33:43 2012 -0500 ---------------------------------------------------------------------- .../cassandra/streaming/StreamInSession.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
