[9/9] 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/94cfec89 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94cfec89 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/94cfec89 Branch: refs/heads/trunk Commit: 94cfec89b8bf9401a7f4f1b49d59679e4c50f598 Parents: 774f3ac 7fc89ad Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Aug 6 09:08:42 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Aug 6 09:08:42 2014 -0500 -- CHANGES.txt | 2 ++ .../cassandra/hadoop/cql3/CqlInputFormat.java| 19 +++ 2 files changed, 13 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/94cfec89/CHANGES.txt --
[9/9] 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/aa25f67e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa25f67e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa25f67e Branch: refs/heads/trunk Commit: aa25f67eaff3b620d635a07e1f6b60466dac3c10 Parents: 6477fa9 ef9473a Author: Jonathan Ellis jbel...@apache.org Authored: Fri Jul 25 17:26:05 2014 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Fri Jul 25 17:26:05 2014 -0500 -- CHANGES.txt| 1 + bin/cassandra-cli.bat | 21 +- bin/cassandra-shuffle.bat | 20 +- bin/cassandra.bat | 3 +- bin/cassandra.ps1 | 839 bin/cqlsh.bat | 68 +-- bin/debug-cql.bat | 100 ++--- bin/nodetool.bat | 20 +- bin/source-conf.ps1| 114 ++--- bin/sstablekeys.bat| 26 +- bin/sstableloader.bat | 102 ++--- bin/sstablescrub.bat | 102 ++--- bin/sstableupgrade.bat | 102 ++--- bin/stop-server.bat| 110 ++--- bin/stop-server.ps1| 356 +++ conf/cassandra-env.ps1 | 648 ++-- tools/bin/cassandra-stress.bat | 21 +- tools/bin/json2sstable.bat | 25 +- tools/bin/sstable2json.bat | 25 +- tools/bin/sstablemetadata.bat | 15 +- tools/bin/sstablesplit.bat | 102 ++--- 21 files changed, 1435 insertions(+), 1385 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa25f67e/CHANGES.txt --
[9/9] 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/65b19cae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65b19cae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65b19cae Branch: refs/heads/trunk Commit: 65b19cae328d61b73fd7b0a12d7b107acd29e704 Parents: 7d8ba3b 40f8eba Author: Yuki Morishita yu...@apache.org Authored: Thu Jun 19 11:33:34 2014 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Thu Jun 19 11:33:34 2014 -0500 -- .../apache/cassandra/db/RangeTombstoneList.java | 2 + .../cassandra/service/ActiveRepairService.java | 3 - .../cassandra/service/StorageService.java | 64 +++- .../org/apache/cassandra/tools/NodeTool.java| 3 + 4 files changed, 54 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/65b19cae/src/java/org/apache/cassandra/service/StorageService.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/65b19cae/src/java/org/apache/cassandra/tools/NodeTool.java --
[9/9] 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/b8c0199c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8c0199c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b8c0199c
Branch: refs/heads/trunk
Commit: b8c0199c33567184043afeff83924a313e69d22f
Parents: a44ba68 8e897de
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri May 2 22:49:44 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri May 2 22:49:44 2014 -0500
--
CHANGES.txt | 4 +-
build.xml | 2 +
.../service/BatchlogEndpointSelector.java | 110 ++
.../apache/cassandra/service/StorageProxy.java | 21 +---
.../service/BatchlogEndpointSelectorTest.java | 116 +++
5 files changed, 236 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8c0199c/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8c0199c/build.xml
--
diff --cc build.xml
index 1f67aa3,898b141..8b47e4e
--- a/build.xml
+++ b/build.xml
@@@ -190,9 -190,10 +190,10 @@@
target name=gen-cli-grammar depends=check-gen-cli-grammar
unless=cliUpToDate
echoBuilding Grammar ${build.src.java}/org/apache/cassandra/cli/Cli.g
/echo
java classname=org.antlr.Tool
-classpath=${build.lib}/antlr-3.2.jar
+
classpath=${build.dir.lib}/jars/antlr-3.5.2.jar;${build.lib}/antlr-runtime-3.5.2.jar;${build.lib}/stringtemplate-4.0.2.jar
fork=true
failonerror=true
+ jvmarg value=-Xmx512M /
arg value=${build.src.java}/org/apache/cassandra/cli/Cli.g /
arg value=-fo /
arg value=${build.src.gen-java}/org/apache/cassandra/cli/ /
@@@ -211,9 -217,21 +212,10 @@@
target name=gen-cql3-grammar depends=check-gen-cql3-grammar
unless=cql3current
echoBuilding Grammar
${build.src.java}/org/apache/cassandra/cql3/Cql.g .../echo
java classname=org.antlr.Tool
-classpath=${build.lib}/antlr-3.2.jar
+
classpath=${build.dir.lib}/jars/antlr-3.5.2.jar;${build.lib}/antlr-runtime-3.5.2.jar;${build.lib}/stringtemplate-4.0.2.jar
fork=true
failonerror=true
+ jvmarg value=-Xmx512M /
arg value=-Xconversiontimeout /
arg value=1 /
arg value=${build.src.java}/org/apache/cassandra/cql3/Cql.g /
[9/9] 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/b96adb99 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b96adb99 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b96adb99 Branch: refs/heads/trunk Commit: b96adb995efeda8c21c3fb7983a016a7e0819f79 Parents: e03a256 0cd1769 Author: Jonathan Ellis jbel...@apache.org Authored: Tue Mar 25 13:28:58 2014 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Mar 25 13:28:58 2014 -0500 -- conf/cassandra.yaml | 60 1 file changed, 25 insertions(+), 35 deletions(-) --
[9/9] 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/5f6e780d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f6e780d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f6e780d Branch: refs/heads/trunk Commit: 5f6e780d8bde7c88960e05e8f96192762137bc4c Parents: 6838790 874a341 Author: Yuki Morishita yu...@apache.org Authored: Mon Mar 24 07:55:11 2014 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Mon Mar 24 07:55:11 2014 -0500 -- --
[9/9] 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/0493da93 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0493da93 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0493da93 Branch: refs/heads/trunk Commit: 0493da933d272ece0c46a9f646ea096c48706ead Parents: e2bef98 fdae99d Author: Jonathan Ellis jbel...@apache.org Authored: Fri Mar 21 21:52:07 2014 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Fri Mar 21 21:52:07 2014 -0500 -- CHANGES.txt | 1 + .../apache/cassandra/service/ReadCallback.java | 20 ++-- .../apache/cassandra/service/StorageProxy.java | 3 ++- 3 files changed, 9 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0493da93/CHANGES.txt --
[9/9] 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/699189f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/699189f1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/699189f1 Branch: refs/heads/trunk Commit: 699189f197ec93606492d03d93917884471bc216 Parents: 0493da9 2574f05 Author: Jonathan Ellis jbel...@apache.org Authored: Fri Mar 21 22:00:26 2014 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Fri Mar 21 22:00:26 2014 -0500 -- src/java/org/apache/cassandra/db/DataTracker.java | 6 ++ 1 file changed, 6 insertions(+) --
[9/9] 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/c946cbf1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c946cbf1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c946cbf1 Branch: refs/heads/trunk Commit: c946cbf18c7eac60062acc75d8d4c5c412ffdd8a Parents: 9eb01ae 0851fd7 Author: Jonathan Ellis jbel...@apache.org Authored: Tue Mar 4 17:10:48 2014 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Mar 4 17:10:48 2014 -0600 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 src/java/org/apache/cassandra/tools/StandaloneScrubber.java | 3 +-- 3 files changed, 6 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c946cbf1/CHANGES.txt --
[9/9] 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/3c186bef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3c186bef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3c186bef Branch: refs/heads/trunk Commit: 3c186bef82e61331951b79df4cce05c0a0f11ebb Parents: b23d6ba b41eb4a Author: Jonathan Ellis jbel...@apache.org Authored: Fri Feb 28 10:08:36 2014 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Fri Feb 28 10:08:36 2014 -0600 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 9 + .../org/apache/cassandra/db/compaction/CompactionTask.java | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3c186bef/CHANGES.txt --
