[11/11] git commit: Merge branch 'cassandra-2.1' into trunk
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/ba22af17 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba22af17 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba22af17 Branch: refs/heads/trunk Commit: ba22af17c3d8b17d4989322e28f122f49430ee34 Parents: 6ad0ddb ff9c631 Author: Mikhail Stepura mish...@apache.org Authored: Fri Aug 15 14:56:45 2014 -0700 Committer: Mikhail Stepura mish...@apache.org Committed: Fri Aug 15 14:56:45 2014 -0700 -- --
[11/11] git commit: Merge branch 'cassandra-2.1' into trunk
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/740bcb54 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/740bcb54 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/740bcb54 Branch: refs/heads/trunk Commit: 740bcb540f2d5a540dcef379dfd7cd50d8916505 Parents: 4a69811 97e74ee Author: Brandon Williams brandonwilli...@apache.org Authored: Tue Aug 5 17:55:01 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Tue Aug 5 17:55:01 2014 -0500 -- conf/cassandra-env.sh | 5 + 1 file changed, 5 insertions(+) --
[11/11] git commit: Merge branch 'cassandra-2.1' into trunk
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/71142cac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71142cac Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71142cac Branch: refs/heads/trunk Commit: 71142cac81d58da035c74604062474117bbec1f0 Parents: c709d98 a31441f Author: Brandon Williams brandonwilli...@apache.org Authored: Mon Aug 4 12:20:56 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon Aug 4 12:20:56 2014 -0500 -- --
[11/11] git commit: Merge branch 'cassandra-2.1' into trunk
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/93c9fb82 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93c9fb82 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/93c9fb82 Branch: refs/heads/trunk Commit: 93c9fb82ceb83fc134a7574b6fe7cd22da6e5c6c Parents: 66dcdd9 b374fd5 Author: Jonathan Ellis jbel...@apache.org Authored: Fri Jul 11 23:51:14 2014 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Fri Jul 11 23:51:14 2014 -0500 -- CHANGES.txt | 1 + .../org/apache/cassandra/locator/DynamicEndpointSnitch.java | 7 ++- 2 files changed, 7 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/93c9fb82/CHANGES.txt --
[11/11] git commit: Merge branch 'cassandra-2.1' into trunk
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/0494e8f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0494e8f2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0494e8f2 Branch: refs/heads/trunk Commit: 0494e8f279409050b7be87da2a011bdf05ab6a66 Parents: da1981c c148e2a Author: Jonathan Ellis jbel...@apache.org Authored: Fri Jun 27 10:27:27 2014 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Fri Jun 27 10:27:27 2014 -0500 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java | 3 +++ 2 files changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0494e8f2/CHANGES.txt --