You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2012/10/17 15:01:20 UTC
svn commit: r1399214 - in /accumulo/trunk: ./ assemble/
assemble/platform/debian/ assemble/platform/debian/init.d/ core/
fate/src/main/java/org/apache/accumulo/fate/
fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ src/
Author: ecn
Date: Wed Oct 17 13:01:19 2012
New Revision: 1399214
URL: http://svn.apache.org/viewvc?rev=1399214&view=rev
Log:
ACCUMULO-819 update rat count, add license to new scripts, remove authors as per the coding standard, merge to trunk
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/assemble/build.sh
accumulo/trunk/assemble/platform/debian/gc-only-init.sh
accumulo/trunk/assemble/platform/debian/init.d/accumulo-gc
accumulo/trunk/assemble/platform/debian/init.d/accumulo-master
accumulo/trunk/assemble/platform/debian/init.d/accumulo-monitor
accumulo/trunk/assemble/platform/debian/init.d/accumulo-tracer
accumulo/trunk/assemble/platform/debian/master-only-init.sh
accumulo/trunk/assemble/platform/debian/monitor-only-init.sh
accumulo/trunk/assemble/platform/debian/stand-alone-init.sh
accumulo/trunk/assemble/platform/debian/tracer-only-init.sh
accumulo/trunk/core/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4.2/src:r1399210
Merged /accumulo/branches/1.4/src:r1399211
Merged /accumulo/branches/1.4:r1399211
Merged /accumulo/branches/1.4.2:r1399210
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src/assemble:r1399211
Merged /accumulo/branches/1.4/assemble:r1399211
Modified: accumulo/trunk/assemble/build.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/build.sh?rev=1399214&r1=1399213&r2=1399214&view=diff
==============================================================================
--- accumulo/trunk/assemble/build.sh (original)
+++ accumulo/trunk/assemble/build.sh Wed Oct 17 13:01:19 2012
@@ -41,7 +41,7 @@ runAt() {
run mvn -U clean
mvn rat:check
COUNT=`grep '!????' target/rat.txt | wc -l`
-EXPECTED=55
+EXPECTED=53
if [ "$COUNT" -ne $EXPECTED ]
then
fail expected $EXPECTED files missing licenses, but saw "$COUNT"
Modified: accumulo/trunk/assemble/platform/debian/gc-only-init.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/platform/debian/gc-only-init.sh?rev=1399214&r1=1399213&r2=1399214&view=diff
==============================================================================
--- accumulo/trunk/assemble/platform/debian/gc-only-init.sh (original)
+++ accumulo/trunk/assemble/platform/debian/gc-only-init.sh Wed Oct 17 13:01:19 2012
@@ -1,4 +1,19 @@
#! /bin/sh
+# 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.
+
if [ $(id -ur) -ne 0 ]; then
echo "This script must be run as root" 1>&2
exit 1
Modified: accumulo/trunk/assemble/platform/debian/init.d/accumulo-gc
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/platform/debian/init.d/accumulo-gc?rev=1399214&r1=1399213&r2=1399214&view=diff
==============================================================================
--- accumulo/trunk/assemble/platform/debian/init.d/accumulo-gc (original)
+++ accumulo/trunk/assemble/platform/debian/init.d/accumulo-gc Wed Oct 17 13:01:19 2012
@@ -9,7 +9,20 @@
# Description: The accumulo garbage collector handles cleanup of old walogs and files in hdfs
### END INIT INFO
-# Author: John Vines <jo...@sqrrl.com>
+# 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.
# Do NOT "set -e"
install -d -m 0775 -o root -g accumulo /var/run/accumulo
Modified: accumulo/trunk/assemble/platform/debian/init.d/accumulo-master
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/platform/debian/init.d/accumulo-master?rev=1399214&r1=1399213&r2=1399214&view=diff
==============================================================================
--- accumulo/trunk/assemble/platform/debian/init.d/accumulo-master (original)
+++ accumulo/trunk/assemble/platform/debian/init.d/accumulo-master Wed Oct 17 13:01:19 2012
@@ -9,7 +9,20 @@
# Description: The accumulo master manages tablet assignment and balance to accumulo
### END INIT INFO
-# Author: John Vines <jo...@sqrrl.com>
+# 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.
# Do NOT "set -e"
install -d -m 0775 -o root -g accumulo /var/run/accumulo
Modified: accumulo/trunk/assemble/platform/debian/init.d/accumulo-monitor
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/platform/debian/init.d/accumulo-monitor?rev=1399214&r1=1399213&r2=1399214&view=diff
==============================================================================
--- accumulo/trunk/assemble/platform/debian/init.d/accumulo-monitor (original)
+++ accumulo/trunk/assemble/platform/debian/init.d/accumulo-monitor Wed Oct 17 13:01:19 2012
@@ -9,7 +9,20 @@
# Description: The accumulo monitor provides a convenient mechanism for monitoring accumulo
### END INIT INFO
-# Author: John Vines <jo...@sqrrl.com>
+# 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.
# Do NOT "set -e"
install -d -m 0775 -o root -g accumulo /var/run/accumulo
Modified: accumulo/trunk/assemble/platform/debian/init.d/accumulo-tracer
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/platform/debian/init.d/accumulo-tracer?rev=1399214&r1=1399213&r2=1399214&view=diff
==============================================================================
--- accumulo/trunk/assemble/platform/debian/init.d/accumulo-tracer (original)
+++ accumulo/trunk/assemble/platform/debian/init.d/accumulo-tracer Wed Oct 17 13:01:19 2012
@@ -9,7 +9,20 @@
# Description: The accumulo tracer provides a mechanism for tracing accumulo calls
### END INIT INFO
-# Author: John Vines <jo...@sqrrl.com>
+# 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.
# Do NOT "set -e"
install -d -m 0775 -o root -g accumulo /var/run/accumulo
Modified: accumulo/trunk/assemble/platform/debian/master-only-init.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/platform/debian/master-only-init.sh?rev=1399214&r1=1399213&r2=1399214&view=diff
==============================================================================
--- accumulo/trunk/assemble/platform/debian/master-only-init.sh (original)
+++ accumulo/trunk/assemble/platform/debian/master-only-init.sh Wed Oct 17 13:01:19 2012
@@ -1,4 +1,19 @@
#! /bin/sh
+# 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.
+
if [ $(id -ur) -ne 0 ]; then
echo "This script must be run as root" 1>&2
exit 1
Modified: accumulo/trunk/assemble/platform/debian/monitor-only-init.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/platform/debian/monitor-only-init.sh?rev=1399214&r1=1399213&r2=1399214&view=diff
==============================================================================
--- accumulo/trunk/assemble/platform/debian/monitor-only-init.sh (original)
+++ accumulo/trunk/assemble/platform/debian/monitor-only-init.sh Wed Oct 17 13:01:19 2012
@@ -1,4 +1,19 @@
#! /bin/sh
+# 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.
+
if [ $(id -ur) -ne 0 ]; then
echo "This script must be run as root" 1>&2
exit 1
Modified: accumulo/trunk/assemble/platform/debian/stand-alone-init.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/platform/debian/stand-alone-init.sh?rev=1399214&r1=1399213&r2=1399214&view=diff
==============================================================================
--- accumulo/trunk/assemble/platform/debian/stand-alone-init.sh (original)
+++ accumulo/trunk/assemble/platform/debian/stand-alone-init.sh Wed Oct 17 13:01:19 2012
@@ -1,4 +1,19 @@
#! /bin/sh
+# 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.
+
if [ $(id -ur) -ne 0 ]; then
echo "This script must be run as root" 1>&2
exit 1
Modified: accumulo/trunk/assemble/platform/debian/tracer-only-init.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/platform/debian/tracer-only-init.sh?rev=1399214&r1=1399213&r2=1399214&view=diff
==============================================================================
--- accumulo/trunk/assemble/platform/debian/tracer-only-init.sh (original)
+++ accumulo/trunk/assemble/platform/debian/tracer-only-init.sh Wed Oct 17 13:01:19 2012
@@ -1,4 +1,19 @@
#! /bin/sh
+# 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.
+
if [ $(id -ur) -ne 0 ]; then
echo "This script must be run as root" 1>&2
exit 1
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/core:r1399211
Merged /accumulo/branches/1.4/src/core:r1399211
Merged /accumulo/branches/1.4.2/src/core:r1399210
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1399211
Merged /accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1399211
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1399211
Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1399211
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4.2/src/server:r1399210
Merged /accumulo/branches/1.4/server:r1399211
Merged /accumulo/branches/1.4/src/server:r1399211
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4.2/src:r1399210
Merged /accumulo/branches/1.4/src:r1399211
Merged /accumulo/branches/1.4/src/src:r1399211