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/e91bf8f3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e91bf8f3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e91bf8f3 Branch: refs/heads/trunk Commit: e91bf8f3ea89d44fdf377a6eff146c745be28f83 Parents: d4f63aa 8436ee6 Author: Mikhail Stepura <mish...@apache.org> Authored: Fri May 30 11:00:14 2014 -0700 Committer: Mikhail Stepura <mish...@apache.org> Committed: Fri May 30 11:00:14 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 8 +++++--- build.xml | 2 +- debian/changelog | 6 ++++++ .../apache/cassandra/concurrent/SEPExecutor.java | 17 +++++++++++++++++ .../org/apache/cassandra/concurrent/SEPWorker.java | 17 +++++++++++++++++ .../apache/cassandra/thrift/MultiSliceTest.java | 17 +++++++++++++++++ 7 files changed, 64 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e91bf8f3/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e91bf8f3/build.xml ----------------------------------------------------------------------
