Updated Branches: refs/heads/cassandra-1.1 6a8ba0731 -> aa7dafaca refs/heads/trunk 20d53c095 -> 85fc72be8
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/85fc72be Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85fc72be Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85fc72be Branch: refs/heads/trunk Commit: 85fc72be8629827b2e92b6aaf2d35a2132f1ab27 Parents: 20d53c0 aa7dafa Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Sep 17 11:44:07 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Sep 17 11:44:07 2012 -0500 ---------------------------------------------------------------------- build.xml | 4 ++++ .../apache/cassandra/thrift/ITransportFactory.java | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/85fc72be/build.xml ----------------------------------------------------------------------
