Merge branch 'cassandra-2.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/91ea6da1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91ea6da1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91ea6da1 Branch: refs/heads/trunk Commit: 91ea6da10899abaaa1ef47d58b38bf3ff0cbd903 Parents: ce248f2 f66689d Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Fri May 30 23:54:53 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Fri May 30 23:54:53 2014 -0400 ---------------------------------------------------------------------- .../cassandra/concurrent/AbstractTracingAwareExecutorService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
