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/07/31 22:14:02 UTC
[01/10] git commit: remove shuffle bat
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 1a0aaf049 -> 563a04bf9
refs/heads/cassandra-2.1 adc138509 -> da1f2dbb5
refs/heads/cassandra-2.1.0 0947fb8a9 -> 8e4415b69
refs/heads/trunk 9aeae5887 -> cf46e4454
remove shuffle bat
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/563a04bf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/563a04bf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/563a04bf
Branch: refs/heads/cassandra-2.0
Commit: 563a04bf98ef394a6455b8c13705425a38c93ea3
Parents: 1a0aaf0
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jul 31 15:12:28 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jul 31 15:12:28 2014 -0500
----------------------------------------------------------------------
bin/cassandra-shuffle.bat | 51 ------------------------------------------
1 file changed, 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/563a04bf/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/da1f2dbb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da1f2dbb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/da1f2dbb
Branch: refs/heads/cassandra-2.1
Commit: da1f2dbb5ead0c96b854219dc03e9b228148c131
Parents: adc1385 8e4415b
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jul 31 15:13:48 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jul 31 15:13:48 2014 -0500
----------------------------------------------------------------------
bin/cassandra-shuffle.bat | 37 -------------------------------------
1 file changed, 37 deletions(-)
----------------------------------------------------------------------
[04/10] git commit: remove shuffle bat
Posted by br...@apache.org.
remove shuffle bat
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/563a04bf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/563a04bf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/563a04bf
Branch: refs/heads/trunk
Commit: 563a04bf98ef394a6455b8c13705425a38c93ea3
Parents: 1a0aaf0
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jul 31 15:12:28 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jul 31 15:12:28 2014 -0500
----------------------------------------------------------------------
bin/cassandra-shuffle.bat | 51 ------------------------------------------
1 file changed, 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/563a04bf/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
Posted by br...@apache.org.
remove shuffle bat
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/563a04bf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/563a04bf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/563a04bf
Branch: refs/heads/cassandra-2.1
Commit: 563a04bf98ef394a6455b8c13705425a38c93ea3
Parents: 1a0aaf0
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jul 31 15:12:28 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jul 31 15:12:28 2014 -0500
----------------------------------------------------------------------
bin/cassandra-shuffle.bat | 51 ------------------------------------------
1 file changed, 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/563a04bf/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
[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/cf46e445
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf46e445
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf46e445
Branch: refs/heads/trunk
Commit: cf46e4454b8ac0c74328bda23142e1f3c4914f00
Parents: 9aeae58 da1f2db
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jul 31 15:13:57 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jul 31 15:13:57 2014 -0500
----------------------------------------------------------------------
bin/cassandra-shuffle.bat | 37 -------------------------------------
1 file changed, 37 deletions(-)
----------------------------------------------------------------------
[07/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
bin/cassandra-shuffle.bat
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e4415b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e4415b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e4415b6
Branch: refs/heads/trunk
Commit: 8e4415b697acc2fc25c52cc3031b0b973fe9fd15
Parents: 0947fb8 563a04b
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jul 31 15:13:37 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jul 31 15:13:37 2014 -0500
----------------------------------------------------------------------
bin/cassandra-shuffle.bat | 37 -------------------------------------
1 file changed, 37 deletions(-)
----------------------------------------------------------------------
[06/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
bin/cassandra-shuffle.bat
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e4415b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e4415b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e4415b6
Branch: refs/heads/cassandra-2.1.0
Commit: 8e4415b697acc2fc25c52cc3031b0b973fe9fd15
Parents: 0947fb8 563a04b
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jul 31 15:13:37 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jul 31 15:13:37 2014 -0500
----------------------------------------------------------------------
bin/cassandra-shuffle.bat | 37 -------------------------------------
1 file changed, 37 deletions(-)
----------------------------------------------------------------------
[02/10] git commit: remove shuffle bat
Posted by br...@apache.org.
remove shuffle bat
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/563a04bf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/563a04bf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/563a04bf
Branch: refs/heads/cassandra-2.1.0
Commit: 563a04bf98ef394a6455b8c13705425a38c93ea3
Parents: 1a0aaf0
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jul 31 15:12:28 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jul 31 15:12:28 2014 -0500
----------------------------------------------------------------------
bin/cassandra-shuffle.bat | 51 ------------------------------------------
1 file changed, 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/563a04bf/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/da1f2dbb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da1f2dbb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/da1f2dbb
Branch: refs/heads/trunk
Commit: da1f2dbb5ead0c96b854219dc03e9b228148c131
Parents: adc1385 8e4415b
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jul 31 15:13:48 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jul 31 15:13:48 2014 -0500
----------------------------------------------------------------------
bin/cassandra-shuffle.bat | 37 -------------------------------------
1 file changed, 37 deletions(-)
----------------------------------------------------------------------
[05/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
bin/cassandra-shuffle.bat
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e4415b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e4415b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e4415b6
Branch: refs/heads/cassandra-2.1
Commit: 8e4415b697acc2fc25c52cc3031b0b973fe9fd15
Parents: 0947fb8 563a04b
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jul 31 15:13:37 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jul 31 15:13:37 2014 -0500
----------------------------------------------------------------------
bin/cassandra-shuffle.bat | 37 -------------------------------------
1 file changed, 37 deletions(-)
----------------------------------------------------------------------