Author: omalley
Date: Tue Sep 16 16:51:42 2008
New Revision: 696104
URL: http://svn.apache.org/viewvc?rev=696104&view=rev
Log:
HADOOP-4181. Include a .gitignore and saveVersion.sh change to support
developing under git. (omalley)
Added:
hadoop/core/trunk/.gitignore
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/saveVersion.sh
Added: hadoop/core/trunk/.gitignore
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/.gitignore?rev=696104&view=auto
==============================================================================
--- hadoop/core/trunk/.gitignore (added)
+++ hadoop/core/trunk/.gitignore Tue Sep 16 16:51:42 2008
@@ -0,0 +1,30 @@
+# 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.
+
+*~
+.classpath
+.project
+.settings
+build/
+conf/masters
+conf/slaves
+conf/hadoop-env.sh
+conf/hadoop-site.xml
+conf/capacity-scheduler.xml
+docs/api/
+logs/
+src/contrib/ec2/bin/hadoop-ec2-env.sh
+src/contrib/index/conf/index-config.xml
+src/docs/build
\ No newline at end of file
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=696104&r1=696103&r2=696104&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Tue Sep 16 16:51:42 2008
@@ -326,6 +326,9 @@
HADOOP-4174. Move fs image/edit log methods from ClientProtocol to
NamenodeProtocol. (shv via szetszwo)
+ HADOOP-4181. Include a .gitignore and saveVersion.sh change to support
+ developing under git. (omalley)
+
OPTIMIZATIONS
HADOOP-3556. Removed lock contention in MD5Hash by changing the
Modified: hadoop/core/trunk/src/saveVersion.sh
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/saveVersion.sh?rev=696104&r1=696103&r2=696104&view=diff
==============================================================================
--- hadoop/core/trunk/src/saveVersion.sh (original)
+++ hadoop/core/trunk/src/saveVersion.sh Tue Sep 16 16:51:42 2008
@@ -21,10 +21,17 @@
unset LANG
unset LC_CTYPE
version=$1
-revision=`svn info | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p'`
-url=`svn info | sed -n -e 's/URL: \(.*\)/\1/p'`
user=`whoami`
date=`date`
+if [ -d .git ]; then
+ revision=`git log -1 --pretty=oneline`
+ hostname=`hostname`
+ branch=`git br | sed -n -e 's/^* //p'`
+ url="git://$hostname/$cwd on branch $branch"
+else
+ revision=`svn info | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p'`
+ url=`svn info | sed -n -e 's/URL: \(.*\)/\1/p'`
+fi
mkdir -p build/src/org/apache/hadoop
cat << EOF | \
sed -e "s/VERSION/$version/" -e "s/USER/$user/" -e "s/DATE/$date/" \
