cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Mon, 11 Nov 2013 17:56:26 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2cc4670a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2cc4670a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2cc4670a

Branch: refs/heads/cassandra-2.0
Commit: 2cc4670acd6598c2a31d895f7f1159e248a2c886
Parents: 2d1085d 512ea5a
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Mon Nov 11 11:54:04 2013 -0600
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Mon Nov 11 11:54:04 2013 -0600

----------------------------------------------------------------------
 bin/cqlsh.bat | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cc4670a/bin/cqlsh.bat
----------------------------------------------------------------------
diff --cc bin/cqlsh.bat
index 79adcff,ffa8e0b..68235b6
--- a/bin/cqlsh.bat
+++ b/bin/cqlsh.bat
@@@ -1,20 -1,19 +1,21 @@@
+ @ECHO OFF
  @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 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 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.
 +@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
  


Mime
View raw message