You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2015/10/16 16:38:33 UTC
[1/2] incubator-trafodion git commit: A couple of python scripts got
incorrect comment markers in their copyrgiht. Fixing those as part of
previous copyright header fix
Repository: incubator-trafodion
Updated Branches:
refs/heads/master ab8f637ee -> 46f7be40c
A couple of python scripts got incorrect comment markers in their copyrgiht. Fixing those as part of previous copyright header fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/89720b80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/89720b80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/89720b80
Branch: refs/heads/master
Commit: 89720b80f929ea33f7abc876f452006bb15f206e
Parents: e7d9133
Author: Sandhya Sundaresan <sa...@esgyn.com>
Authored: Wed Oct 14 05:04:04 2015 +0000
Committer: Sandhya Sundaresan <sa...@esgyn.com>
Committed: Wed Oct 14 05:04:04 2015 +0000
----------------------------------------------------------------------
core/rest/bin/scripts/sys_shell.py | 42 +++++++++++++++----------------
dcs/src/test/pytests/test_p2.py | 44 ++++++++++++++++-----------------
2 files changed, 43 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/89720b80/core/rest/bin/scripts/sys_shell.py
----------------------------------------------------------------------
diff --git a/core/rest/bin/scripts/sys_shell.py b/core/rest/bin/scripts/sys_shell.py
index 38bf783..0e18c0d 100755
--- a/core/rest/bin/scripts/sys_shell.py
+++ b/core/rest/bin/scripts/sys_shell.py
@@ -1,24 +1,24 @@
#/**
-* @@@ START COPYRIGHT @@@
-*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*
-* @@@ END COPYRIGHT @@@
+#* @@@ START COPYRIGHT @@@
+#*
+#* Licensed to the Apache Software Foundation (ASF) under one
+#* or more contributor license agreements. See the NOTICE file
+#* distributed with this work for additional information
+#* regarding copyright ownership. The ASF licenses this file
+#* to you under the Apache License, Version 2.0 (the
+#* "License"); you may not use this file except in compliance
+#* with the License. You may obtain a copy of the License at
+#*
+#* http://www.apache.org/licenses/LICENSE-2.0
+#*
+#* Unless required by applicable law or agreed to in writing,
+#* software distributed under the License is distributed on an
+#* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#* KIND, either express or implied. See the License for the
+#* specific language governing permissions and limitations
+#* under the License.
+#*
+#* @@@ END COPYRIGHT @@@
# */
#
@@ -69,4 +69,4 @@ if isDebug() == True :
start()
if isDebug() == True :
- log ('End script[' + scriptcontext.getScriptName() + ']')
\ No newline at end of file
+ log ('End script[' + scriptcontext.getScriptName() + ']')
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/89720b80/dcs/src/test/pytests/test_p2.py
----------------------------------------------------------------------
diff --git a/dcs/src/test/pytests/test_p2.py b/dcs/src/test/pytests/test_p2.py
index 6567e31..69966da 100755
--- a/dcs/src/test/pytests/test_p2.py
+++ b/dcs/src/test/pytests/test_p2.py
@@ -1,26 +1,26 @@
'''
-/**
-* @@@ START COPYRIGHT @@@
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-
-* @@@ END COPYRIGHT @@@
- */
+#/**
+#* @@@ START COPYRIGHT @@@
+#
+#Licensed to the Apache Software Foundation (ASF) under one
+#or more contributor license agreements. See the NOTICE file
+#distributed with this work for additional information
+#regarding copyright ownership. The ASF licenses this file
+#to you under the Apache License, Version 2.0 (the
+#"License"); you may not use this file except in compliance
+#with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+#Unless required by applicable law or agreed to in writing,
+#software distributed under the License is distributed on an
+#"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#KIND, either express or implied. See the License for the
+#specific language governing permissions and limitations
+#under the License.
+#
+#* @@@ END COPYRIGHT @@@
+#*/
PYODBC TESTS
'''
import ConfigParser
[2/2] incubator-trafodion git commit: Merge remote branch
'origin/pr/124/head' into mrg_63
Posted by su...@apache.org.
Merge remote branch 'origin/pr/124/head' into mrg_63
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/46f7be40
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/46f7be40
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/46f7be40
Branch: refs/heads/master
Commit: 46f7be40c1a9be375c6de9c2e9d3387c680f4829
Parents: ab8f637 89720b8
Author: Suresh Subbiah <su...@apache.org>
Authored: Fri Oct 16 04:21:59 2015 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Fri Oct 16 04:21:59 2015 +0000
----------------------------------------------------------------------
core/rest/bin/scripts/sys_shell.py | 42 +++++++++++++++----------------
dcs/src/test/pytests/test_p2.py | 44 ++++++++++++++++-----------------
2 files changed, 43 insertions(+), 43 deletions(-)
----------------------------------------------------------------------