You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/08/04 19:13:27 UTC
[01/10] git commit: remove shuffle bat again
Repository: cassandra
Updated Branches:
refs/heads/cassandra-1.2 4a9634a31 -> 244f23418
refs/heads/cassandra-2.1 c47906d7e -> 5331900f8
refs/heads/cassandra-2.1.0 4b57695ce -> 381dd8952
refs/heads/trunk 55e874f61 -> c709d98b6
remove shuffle bat again
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/244f2341
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/244f2341
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/244f2341
Branch: refs/heads/cassandra-1.2
Commit: 244f23418959558056a79b6843581177b0c334bc
Parents: 4a9634a
Author: Brandon Williams <br...@apache.org>
Authored: Mon Aug 4 12:12:43 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Aug 4 12:12:43 2014 -0500
----------------------------------------------------------------------
bin/cassandra-shuffle.bat | 51 ------------------------------------------
1 file changed, 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/244f2341/bin/cassandra-shuffle.bat
----------------------------------------------------------------------
diff --git a/bin/cassandra-shuffle.bat b/bin/cassandra-shuffle.bat
deleted file mode 100644
index d920d09..0000000
--- a/bin/cassandra-shuffle.bat
+++ /dev/null
@@ -1,51 +0,0 @@
-@REM
-@REM Licensed to the Apache Software Foundation (ASF) under one or more
-@REM contributor license agreements. See the NOTICE file distributed with
-@REM this work for additional information regarding copyright ownership.
-@REM The ASF licenses this file to You under the Apache License, Version 2.0
-@REM (the "License"); you may not use this file except in compliance with
-@REM the License. You may obtain a copy of the License at
-@REM
-@REM http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing, software
-@REM distributed under the License is distributed on an "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@REM See the License for the specific language governing permissions and
-@REM limitations under the License.
-
-
-@echo off
-if "%OS%" == "Windows_NT" setlocal
-
-if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
-if NOT DEFINED JAVA_HOME goto :err
-
-REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH=
-
-REM For each jar in the CASSANDRA_HOME lib directory call append to build the CLASSPATH variable.
-for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i"
-goto okClasspath
-
-:append
-set CLASSPATH=%CLASSPATH%;%1
-goto :eof
-
-:okClasspath
-REM Include the build\classes\main directory so it works in development
-set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main";"%CASSANDRA_HOME%\build\classes\thrift"
-goto runCli
-
-:runCli
-echo Starting Cassandra Client
-"%JAVA_HOME%\bin\java" -cp %CASSANDRA_CLASSPATH% org.apache.cassandra.tools.Shuffle %*
-goto finally
-
-:err
-echo The JAVA_HOME environment variable must be set to run this program!
-pause
-
-:finally
-
-ENDLOCAL
[06/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.1.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/381dd895
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/381dd895
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/381dd895
Branch: refs/heads/cassandra-2.1.0
Commit: 381dd895215e4ef0c1d2a863297b019da70571f8
Parents: 4b57695 244f234
Author: Brandon Williams <br...@apache.org>
Authored: Mon Aug 4 12:12:57 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Aug 4 12:12:57 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[05/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.1.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/381dd895
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/381dd895
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/381dd895
Branch: refs/heads/cassandra-2.1
Commit: 381dd895215e4ef0c1d2a863297b019da70571f8
Parents: 4b57695 244f234
Author: Brandon Williams <br...@apache.org>
Authored: Mon Aug 4 12:12:57 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Aug 4 12:12:57 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[04/10] git commit: remove shuffle bat again
Posted by br...@apache.org.
remove shuffle bat again
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/244f2341
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/244f2341
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/244f2341
Branch: refs/heads/trunk
Commit: 244f23418959558056a79b6843581177b0c334bc
Parents: 4a9634a
Author: Brandon Williams <br...@apache.org>
Authored: Mon Aug 4 12:12:43 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Aug 4 12:12:43 2014 -0500
----------------------------------------------------------------------
bin/cassandra-shuffle.bat | 51 ------------------------------------------
1 file changed, 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/244f2341/bin/cassandra-shuffle.bat
----------------------------------------------------------------------
diff --git a/bin/cassandra-shuffle.bat b/bin/cassandra-shuffle.bat
deleted file mode 100644
index d920d09..0000000
--- a/bin/cassandra-shuffle.bat
+++ /dev/null
@@ -1,51 +0,0 @@
-@REM
-@REM Licensed to the Apache Software Foundation (ASF) under one or more
-@REM contributor license agreements. See the NOTICE file distributed with
-@REM this work for additional information regarding copyright ownership.
-@REM The ASF licenses this file to You under the Apache License, Version 2.0
-@REM (the "License"); you may not use this file except in compliance with
-@REM the License. You may obtain a copy of the License at
-@REM
-@REM http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing, software
-@REM distributed under the License is distributed on an "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@REM See the License for the specific language governing permissions and
-@REM limitations under the License.
-
-
-@echo off
-if "%OS%" == "Windows_NT" setlocal
-
-if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
-if NOT DEFINED JAVA_HOME goto :err
-
-REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH=
-
-REM For each jar in the CASSANDRA_HOME lib directory call append to build the CLASSPATH variable.
-for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i"
-goto okClasspath
-
-:append
-set CLASSPATH=%CLASSPATH%;%1
-goto :eof
-
-:okClasspath
-REM Include the build\classes\main directory so it works in development
-set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main";"%CASSANDRA_HOME%\build\classes\thrift"
-goto runCli
-
-:runCli
-echo Starting Cassandra Client
-"%JAVA_HOME%\bin\java" -cp %CASSANDRA_CLASSPATH% org.apache.cassandra.tools.Shuffle %*
-goto finally
-
-:err
-echo The JAVA_HOME environment variable must be set to run this program!
-pause
-
-:finally
-
-ENDLOCAL
[03/10] git commit: remove shuffle bat again
Posted by br...@apache.org.
remove shuffle bat again
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/244f2341
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/244f2341
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/244f2341
Branch: refs/heads/cassandra-2.1
Commit: 244f23418959558056a79b6843581177b0c334bc
Parents: 4a9634a
Author: Brandon Williams <br...@apache.org>
Authored: Mon Aug 4 12:12:43 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Aug 4 12:12:43 2014 -0500
----------------------------------------------------------------------
bin/cassandra-shuffle.bat | 51 ------------------------------------------
1 file changed, 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/244f2341/bin/cassandra-shuffle.bat
----------------------------------------------------------------------
diff --git a/bin/cassandra-shuffle.bat b/bin/cassandra-shuffle.bat
deleted file mode 100644
index d920d09..0000000
--- a/bin/cassandra-shuffle.bat
+++ /dev/null
@@ -1,51 +0,0 @@
-@REM
-@REM Licensed to the Apache Software Foundation (ASF) under one or more
-@REM contributor license agreements. See the NOTICE file distributed with
-@REM this work for additional information regarding copyright ownership.
-@REM The ASF licenses this file to You under the Apache License, Version 2.0
-@REM (the "License"); you may not use this file except in compliance with
-@REM the License. You may obtain a copy of the License at
-@REM
-@REM http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing, software
-@REM distributed under the License is distributed on an "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@REM See the License for the specific language governing permissions and
-@REM limitations under the License.
-
-
-@echo off
-if "%OS%" == "Windows_NT" setlocal
-
-if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
-if NOT DEFINED JAVA_HOME goto :err
-
-REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH=
-
-REM For each jar in the CASSANDRA_HOME lib directory call append to build the CLASSPATH variable.
-for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i"
-goto okClasspath
-
-:append
-set CLASSPATH=%CLASSPATH%;%1
-goto :eof
-
-:okClasspath
-REM Include the build\classes\main directory so it works in development
-set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main";"%CASSANDRA_HOME%\build\classes\thrift"
-goto runCli
-
-:runCli
-echo Starting Cassandra Client
-"%JAVA_HOME%\bin\java" -cp %CASSANDRA_CLASSPATH% org.apache.cassandra.tools.Shuffle %*
-goto finally
-
-:err
-echo The JAVA_HOME environment variable must be set to run this program!
-pause
-
-:finally
-
-ENDLOCAL
[09/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5331900f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5331900f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5331900f
Branch: refs/heads/cassandra-2.1
Commit: 5331900f8ec51f50d1a2101051c7fc1e4ada8b31
Parents: c47906d 381dd89
Author: Brandon Williams <br...@apache.org>
Authored: Mon Aug 4 12:13:12 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Aug 4 12:13:12 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[07/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.1.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/381dd895
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/381dd895
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/381dd895
Branch: refs/heads/trunk
Commit: 381dd895215e4ef0c1d2a863297b019da70571f8
Parents: 4b57695 244f234
Author: Brandon Williams <br...@apache.org>
Authored: Mon Aug 4 12:12:57 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Aug 4 12:12:57 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[02/10] git commit: remove shuffle bat again
Posted by br...@apache.org.
remove shuffle bat again
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/244f2341
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/244f2341
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/244f2341
Branch: refs/heads/cassandra-2.1.0
Commit: 244f23418959558056a79b6843581177b0c334bc
Parents: 4a9634a
Author: Brandon Williams <br...@apache.org>
Authored: Mon Aug 4 12:12:43 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Aug 4 12:12:43 2014 -0500
----------------------------------------------------------------------
bin/cassandra-shuffle.bat | 51 ------------------------------------------
1 file changed, 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/244f2341/bin/cassandra-shuffle.bat
----------------------------------------------------------------------
diff --git a/bin/cassandra-shuffle.bat b/bin/cassandra-shuffle.bat
deleted file mode 100644
index d920d09..0000000
--- a/bin/cassandra-shuffle.bat
+++ /dev/null
@@ -1,51 +0,0 @@
-@REM
-@REM Licensed to the Apache Software Foundation (ASF) under one or more
-@REM contributor license agreements. See the NOTICE file distributed with
-@REM this work for additional information regarding copyright ownership.
-@REM The ASF licenses this file to You under the Apache License, Version 2.0
-@REM (the "License"); you may not use this file except in compliance with
-@REM the License. You may obtain a copy of the License at
-@REM
-@REM http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing, software
-@REM distributed under the License is distributed on an "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@REM See the License for the specific language governing permissions and
-@REM limitations under the License.
-
-
-@echo off
-if "%OS%" == "Windows_NT" setlocal
-
-if NOT DEFINED CASSANDRA_HOME set CASSANDRA_HOME=%~dp0..
-if NOT DEFINED JAVA_HOME goto :err
-
-REM Ensure that any user defined CLASSPATH variables are not used on startup
-set CLASSPATH=
-
-REM For each jar in the CASSANDRA_HOME lib directory call append to build the CLASSPATH variable.
-for %%i in ("%CASSANDRA_HOME%\lib\*.jar") do call :append "%%i"
-goto okClasspath
-
-:append
-set CLASSPATH=%CLASSPATH%;%1
-goto :eof
-
-:okClasspath
-REM Include the build\classes\main directory so it works in development
-set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main";"%CASSANDRA_HOME%\build\classes\thrift"
-goto runCli
-
-:runCli
-echo Starting Cassandra Client
-"%JAVA_HOME%\bin\java" -cp %CASSANDRA_CLASSPATH% org.apache.cassandra.tools.Shuffle %*
-goto finally
-
-:err
-echo The JAVA_HOME environment variable must be set to run this program!
-pause
-
-:finally
-
-ENDLOCAL
[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5331900f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5331900f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5331900f
Branch: refs/heads/trunk
Commit: 5331900f8ec51f50d1a2101051c7fc1e4ada8b31
Parents: c47906d 381dd89
Author: Brandon Williams <br...@apache.org>
Authored: Mon Aug 4 12:13:12 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Aug 4 12:13:12 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[10/10] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
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/c709d98b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c709d98b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c709d98b
Branch: refs/heads/trunk
Commit: c709d98b68141be3314220a08f7519b2459cf16b
Parents: 55e874f 5331900
Author: Brandon Williams <br...@apache.org>
Authored: Mon Aug 4 12:13:22 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Aug 4 12:13:22 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------