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/8b410078
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b410078
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b410078

Branch: refs/heads/trunk
Commit: 8b410078a4d2c779930ee0228d263b926beda00c
Parents: 94d42a9 b69c1aa
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri May 17 10:29:10 2013 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri May 17 10:29:10 2013 -0500

----------------------------------------------------------------------
 build.xml                                          |    2 +-
 lib/snappy-java-1.0.4.1.jar                        |  Bin 995967 -> 0 bytes
 lib/snappy-java-1.0.5.jar                          |  Bin 0 -> 1251514 bytes
 .../transport/RequestThreadPoolExecutor.java       |    4 ++--
 4 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b410078/build.xml
----------------------------------------------------------------------

Reply via email to