Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
Reply-To: common-dev@hadoop.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1531978 - in
 /hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/test/bin:
 cat.cmd xargs_cat.cmd
Date: Mon, 14 Oct 2013 17:06:44 -0000
To: common-commits@hadoop.apache.org
From: cnauroth@apache.org
Message-Id: <20131014170644.9C3152388A67@eris.apache.org>

Author: cnauroth
Date: Mon Oct 14 17:06:42 2013
New Revision: 1531978

URL: http://svn.apache.org/r1531978
Log:
HADOOP-10040. Merging change r1531977 from trunk to branch-2.

Modified:
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd   (contents, props changed)
    hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/test/bin/xargs_cat.cmd   (contents, props changed)

Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd?rev=1531978&r1=1531977&r2=1531978&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd (original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd Mon Oct 14 17:06:42 2013
@@ -1,18 +1,18 @@
-@rem Licensed to the Apache Software Foundation (ASF) under one
-@rem or more contributor license agreements.  See the NOTICE file
-@rem distributed with this work for additional information
-@rem regarding copyright ownership.  The ASF licenses this file
-@rem to you under the Apache License, Version 2.0 (the
-@rem "License"); you may not use this file except in compliance
-@rem with 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.
-
-@for /F "usebackq tokens=* delims=" %%A in (`findstr .`) do @echo %%A
-@rem lines have been copied from stdin to stdout
+@rem Licensed to the Apache Software Foundation (ASF) under one
+@rem or more contributor license agreements.  See the NOTICE file
+@rem distributed with this work for additional information
+@rem regarding copyright ownership.  The ASF licenses this file
+@rem to you under the Apache License, Version 2.0 (the
+@rem "License"); you may not use this file except in compliance
+@rem with 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.
+
+@for /F "usebackq tokens=* delims=" %%A in (`findstr .`) do @echo %%A
+@rem lines have been copied from stdin to stdout

Propchange: hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/test/bin/cat.cmd
            ('svn:eol-style' removed)

Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/test/bin/xargs_cat.cmd
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/test/bin/xargs_cat.cmd?rev=1531978&r1=1531977&r2=1531978&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/test/bin/xargs_cat.cmd (original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/test/bin/xargs_cat.cmd Mon Oct 14 17:06:42 2013
@@ -1,18 +1,18 @@
-@rem Licensed to the Apache Software Foundation (ASF) under one
-@rem or more contributor license agreements.  See the NOTICE file
-@rem distributed with this work for additional information
-@rem regarding copyright ownership.  The ASF licenses this file
-@rem to you under the Apache License, Version 2.0 (the
-@rem "License"); you may not use this file except in compliance
-@rem with 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.
-
-@for /F "usebackq tokens=* delims=" %%A in (`findstr .`) do @type %%A
-@rem files named on stdin have been copied to stdout
+@rem Licensed to the Apache Software Foundation (ASF) under one
+@rem or more contributor license agreements.  See the NOTICE file
+@rem distributed with this work for additional information
+@rem regarding copyright ownership.  The ASF licenses this file
+@rem to you under the Apache License, Version 2.0 (the
+@rem "License"); you may not use this file except in compliance
+@rem with 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.
+
+@for /F "usebackq tokens=* delims=" %%A in (`findstr .`) do @type %%A
+@rem files named on stdin have been copied to stdout

Propchange: hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/test/bin/xargs_cat.cmd
            ('svn:eol-style' removed)