accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [2/2] git commit: Merge branch '1.6.0-SNAPSHOT'
Date Mon, 14 Apr 2014 21:16:00 GMT
Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/63f1e767
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/63f1e767
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/63f1e767

Branch: refs/heads/master
Commit: 63f1e7678bba222da3642ec49eb8dfbfb491f9a7
Parents: f6a67c2 77fe4da
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Mon Apr 14 17:15:29 2014 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Mon Apr 14 17:15:29 2014 -0400

----------------------------------------------------------------------
 shell/src/test/resources/shelltest.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/63f1e767/shell/src/test/resources/shelltest.txt
----------------------------------------------------------------------
diff --cc shell/src/test/resources/shelltest.txt
index 19b6f61,0000000..d2eb955
mode 100644,000000..100644
--- a/shell/src/test/resources/shelltest.txt
+++ b/shell/src/test/resources/shelltest.txt
@@@ -1,16 -1,0 +1,16 @@@
- # Software Foundation (ASF) under one or more
++# 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.
 +exit
 +foo


Mime
View raw message