accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bil...@apache.org
Subject svn commit: r1402730 - in /accumulo/trunk: ./ assemble/ assemble/platform/debian/ assemble/platform/debian/init.d/ conf/ conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/ conf/examples/2GB/standalon...
Date Sat, 27 Oct 2012 00:59:26 GMT
Author: billie
Date: Sat Oct 27 00:59:22 2012
New Revision: 1402730

URL: http://svn.apache.org/viewvc?rev=1402730&view=rev
Log:
ACCUMULO-819 fixed some svn props - merged to trunk, added a bunch of licenses

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/assemble/   (props changed)
    accumulo/trunk/assemble/platform/debian/init.d/accumulo-gc   (props changed)
    accumulo/trunk/assemble/platform/debian/init.d/accumulo-master   (props changed)
    accumulo/trunk/assemble/platform/debian/init.d/accumulo-monitor   (props changed)
    accumulo/trunk/assemble/platform/debian/init.d/accumulo-tracer   (props changed)
    accumulo/trunk/assemble/platform/debian/init.d/accumulo-tserver   (contents, props changed)
    accumulo/trunk/assemble/platform/debian/tserver-only-init.sh
    accumulo/trunk/conf/accumulo.policy.example   (props changed)
    accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-env.sh   (props changed)
    accumulo/trunk/conf/examples/1GB/native-standalone/gc   (props changed)
    accumulo/trunk/conf/examples/1GB/native-standalone/masters   (props changed)
    accumulo/trunk/conf/examples/1GB/native-standalone/monitor   (props changed)
    accumulo/trunk/conf/examples/1GB/native-standalone/slaves   (props changed)
    accumulo/trunk/conf/examples/1GB/native-standalone/tracers   (props changed)
    accumulo/trunk/conf/examples/1GB/standalone/accumulo-env.sh   (props changed)
    accumulo/trunk/conf/examples/1GB/standalone/gc   (props changed)
    accumulo/trunk/conf/examples/1GB/standalone/masters   (props changed)
    accumulo/trunk/conf/examples/1GB/standalone/monitor   (props changed)
    accumulo/trunk/conf/examples/1GB/standalone/slaves   (props changed)
    accumulo/trunk/conf/examples/1GB/standalone/tracers   (props changed)
    accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-env.sh   (props changed)
    accumulo/trunk/conf/examples/2GB/native-standalone/gc   (props changed)
    accumulo/trunk/conf/examples/2GB/native-standalone/masters   (props changed)
    accumulo/trunk/conf/examples/2GB/native-standalone/monitor   (props changed)
    accumulo/trunk/conf/examples/2GB/native-standalone/slaves   (props changed)
    accumulo/trunk/conf/examples/2GB/native-standalone/tracers   (props changed)
    accumulo/trunk/conf/examples/2GB/standalone/accumulo-env.sh   (props changed)
    accumulo/trunk/conf/examples/2GB/standalone/gc   (props changed)
    accumulo/trunk/conf/examples/2GB/standalone/masters   (props changed)
    accumulo/trunk/conf/examples/2GB/standalone/monitor   (props changed)
    accumulo/trunk/conf/examples/2GB/standalone/slaves   (props changed)
    accumulo/trunk/conf/examples/2GB/standalone/tracers   (props changed)
    accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-env.sh   (props changed)
    accumulo/trunk/conf/examples/3GB/native-standalone/gc   (props changed)
    accumulo/trunk/conf/examples/3GB/native-standalone/masters   (props changed)
    accumulo/trunk/conf/examples/3GB/native-standalone/monitor   (props changed)
    accumulo/trunk/conf/examples/3GB/native-standalone/slaves   (props changed)
    accumulo/trunk/conf/examples/3GB/native-standalone/tracers   (props changed)
    accumulo/trunk/conf/examples/3GB/standalone/accumulo-env.sh   (props changed)
    accumulo/trunk/conf/examples/3GB/standalone/gc   (props changed)
    accumulo/trunk/conf/examples/3GB/standalone/masters   (props changed)
    accumulo/trunk/conf/examples/3GB/standalone/monitor   (props changed)
    accumulo/trunk/conf/examples/3GB/standalone/slaves   (props changed)
    accumulo/trunk/conf/examples/3GB/standalone/tracers   (props changed)
    accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-env.sh   (props changed)
    accumulo/trunk/conf/examples/512MB/native-standalone/gc   (props changed)
    accumulo/trunk/conf/examples/512MB/native-standalone/masters   (props changed)
    accumulo/trunk/conf/examples/512MB/native-standalone/monitor   (props changed)
    accumulo/trunk/conf/examples/512MB/native-standalone/slaves   (props changed)
    accumulo/trunk/conf/examples/512MB/native-standalone/tracers   (props changed)
    accumulo/trunk/conf/examples/512MB/standalone/accumulo-env.sh   (props changed)
    accumulo/trunk/conf/examples/512MB/standalone/gc   (props changed)
    accumulo/trunk/conf/examples/512MB/standalone/masters   (props changed)
    accumulo/trunk/conf/examples/512MB/standalone/monitor   (props changed)
    accumulo/trunk/conf/examples/512MB/standalone/slaves   (props changed)
    accumulo/trunk/conf/examples/512MB/standalone/tracers   (props changed)
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TimeoutTabletLocator.java   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/system/StatsIterator.java   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/HexFormatter.java   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/interpret/DefaultScanInterpreter.java   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/interpret/HexScanInterpreter.java   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/interpret/ScanInterpreter.java   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptions.java   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ExportTableCommand.java   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ImportTableCommand.java   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/InterpreterCommand.java   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ShellPluginConfigurationCommand.java   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java   (props changed)
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mock/TestBatchScanner821.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mock/TransformIterator.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/file/rfile/RelativeKeyTest.java   (props changed)
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowIteratorTest.java   (props changed)
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/shell/command/FormatterCommandTest.java   (props changed)
    accumulo/trunk/docs/README_UBUNTU   (props changed)
    accumulo/trunk/docs/examples/README.export   (props changed)
    accumulo/trunk/docs/examples/README.maxmutation   (props changed)
    accumulo/trunk/docs/src/developer_manual/build.sh   (props changed)
    accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/UniqueColumns.java   (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/server/src/main/java/org/apache/accumulo/server/data/ServerColumnUpdate.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/data/ServerMutation.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/ExportTable.java   (props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/ImportTable.java   (props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/metanalysis/FilterMeta.java   (props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java   (props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/metanalysis/IndexMeta.java   (props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/metanalysis/LogFileInputFormat.java   (props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/metanalysis/LogFileOutputFormat.java   (props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java   (props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/metanalysis/package-info.java   (contents, props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/BulkFailedCopyProcessor.java   (props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletMutations.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/GenSplits.java   (props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/FateStarvationTest.java   (props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/SlowConstraint.java   (props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/SparseColumnFamilyTest.java   (props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/TimeoutTest.java   (props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/randomwalk/concurrent/StartAll.java   (contents, props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/randomwalk/concurrent/StopTabletServer.java   (contents, props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/CompactFilter.java   (props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ExportIndex.java   (props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java   (props changed)
    accumulo/trunk/server/src/test/java/org/apache/accumulo/server/data/ServerMutationTest.java
    accumulo/trunk/src/   (props changed)
    accumulo/trunk/test/compat/japi-compliance/README   (props changed)
    accumulo/trunk/test/compat/japi-compliance/japi-accumulo-1.4.xml   (props changed)
    accumulo/trunk/test/compat/japi-compliance/japi-accumulo-1.5.xml   (props changed)
    accumulo/trunk/test/system/auto/config.py   (props changed)
    accumulo/trunk/test/system/auto/simple/baditerminc.py   (props changed)
    accumulo/trunk/test/system/auto/simple/combiner.py   (props changed)
    accumulo/trunk/test/system/auto/simple/examples.py   (props changed)
    accumulo/trunk/test/system/auto/simple/fateStartvation.py   (props changed)
    accumulo/trunk/test/system/auto/simple/sparseColumnFamily.py   (props changed)
    accumulo/trunk/test/system/auto/simple/timeout.py   (props changed)
    accumulo/trunk/test/system/auto/stress/migrations.py   (props changed)
    accumulo/trunk/test/system/randomwalk/bin/reset-cluster.sh   (props changed)

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4.2/src:r1402681
  Merged /accumulo/branches/1.4/src:r1402682
  Merged /accumulo/branches/1.4:r1402682
  Merged /accumulo/branches/1.4.2:r1402681

Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/assemble:r1402682
  Merged /accumulo/branches/1.4/assemble:r1402682

Propchange: accumulo/trunk/assemble/platform/debian/init.d/accumulo-gc
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/assemble/platform/debian/init.d/accumulo-master
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/assemble/platform/debian/init.d/accumulo-monitor
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/assemble/platform/debian/init.d/accumulo-tracer
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: accumulo/trunk/assemble/platform/debian/init.d/accumulo-tserver
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/platform/debian/init.d/accumulo-tserver?rev=1402730&r1=1402729&r2=1402730&view=diff
==============================================================================
--- accumulo/trunk/assemble/platform/debian/init.d/accumulo-tserver (original)
+++ accumulo/trunk/assemble/platform/debian/init.d/accumulo-tserver Sat Oct 27 00:59:22 2012
@@ -9,7 +9,20 @@
 # Description:      The accumulo tserver process 
 ### END INIT INFO
 
-# Author: John Vines <john@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

Propchange: accumulo/trunk/assemble/platform/debian/init.d/accumulo-tserver
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: accumulo/trunk/assemble/platform/debian/tserver-only-init.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/platform/debian/tserver-only-init.sh?rev=1402730&r1=1402729&r2=1402730&view=diff
==============================================================================
--- accumulo/trunk/assemble/platform/debian/tserver-only-init.sh (original)
+++ accumulo/trunk/assemble/platform/debian/tserver-only-init.sh Sat Oct 27 00:59:22 2012
@@ -1,4 +1,20 @@
 #! /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/conf/accumulo.policy.example
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-env.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: accumulo/trunk/conf/examples/1GB/native-standalone/gc
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/1GB/native-standalone/masters
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/1GB/native-standalone/monitor
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/1GB/native-standalone/slaves
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/1GB/native-standalone/tracers
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/1GB/standalone/accumulo-env.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: accumulo/trunk/conf/examples/1GB/standalone/gc
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/1GB/standalone/masters
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/1GB/standalone/monitor
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/1GB/standalone/slaves
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/1GB/standalone/tracers
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-env.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: accumulo/trunk/conf/examples/2GB/native-standalone/gc
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/2GB/native-standalone/masters
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/2GB/native-standalone/monitor
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/2GB/native-standalone/slaves
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/2GB/native-standalone/tracers
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/2GB/standalone/accumulo-env.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: accumulo/trunk/conf/examples/2GB/standalone/gc
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/2GB/standalone/masters
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/2GB/standalone/monitor
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/2GB/standalone/slaves
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/2GB/standalone/tracers
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-env.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: accumulo/trunk/conf/examples/3GB/native-standalone/gc
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/3GB/native-standalone/masters
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/3GB/native-standalone/monitor
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/3GB/native-standalone/slaves
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/3GB/native-standalone/tracers
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/3GB/standalone/accumulo-env.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: accumulo/trunk/conf/examples/3GB/standalone/gc
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/3GB/standalone/masters
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/3GB/standalone/monitor
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/3GB/standalone/slaves
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/3GB/standalone/tracers
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-env.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: accumulo/trunk/conf/examples/512MB/native-standalone/gc
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/512MB/native-standalone/masters
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/512MB/native-standalone/monitor
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/512MB/native-standalone/slaves
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/512MB/native-standalone/tracers
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/512MB/standalone/accumulo-env.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: accumulo/trunk/conf/examples/512MB/standalone/gc
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/512MB/standalone/masters
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/512MB/standalone/monitor
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/512MB/standalone/slaves
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/conf/examples/512MB/standalone/tracers
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/core:r1402682
  Merged /accumulo/branches/1.4/src/core:r1402682
  Merged /accumulo/branches/1.4.2/src/core:r1402681

Propchange: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TimeoutTabletLocator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/system/StatsIterator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/format/HexFormatter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/interpret/DefaultScanInterpreter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/interpret/HexScanInterpreter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/interpret/ScanInterpreter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptions.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ExportTableCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ImportTableCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/InterpreterCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ShellPluginConfigurationCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java?rev=1402730&r1=1402729&r2=1402730&view=diff
==============================================================================
--- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java (original)
+++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java Sat Oct 27 00:59:22 2012
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
 package org.apache.accumulo.core.client;
 
 import static org.junit.Assert.assertFalse;

Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mock/TestBatchScanner821.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mock/TestBatchScanner821.java?rev=1402730&r1=1402729&r2=1402730&view=diff
==============================================================================
--- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mock/TestBatchScanner821.java (original)
+++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mock/TestBatchScanner821.java Sat Oct 27 00:59:22 2012
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
 package org.apache.accumulo.core.client.mock;
 
 import static org.junit.Assert.assertEquals;

Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mock/TransformIterator.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mock/TransformIterator.java?rev=1402730&r1=1402729&r2=1402730&view=diff
==============================================================================
--- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mock/TransformIterator.java (original)
+++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mock/TransformIterator.java Sat Oct 27 00:59:22 2012
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
 package org.apache.accumulo.core.client.mock;
 
 import org.apache.accumulo.core.data.Key;

Propchange: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/file/rfile/RelativeKeyTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowIteratorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/shell/command/FormatterCommandTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/docs/README_UBUNTU
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/docs/examples/README.export
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/docs/examples/README.maxmutation
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/docs/src/developer_manual/build.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/UniqueColumns.java
------------------------------------------------------------------------------
    svn:eol-style = native

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:r1402682
  Merged /accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1402682

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:r1402682
  Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1402682

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4.2/src/server:r1402681
  Merged /accumulo/branches/1.4/server:r1402682
  Merged /accumulo/branches/1.4/src/server:r1402682

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/data/ServerColumnUpdate.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/data/ServerColumnUpdate.java?rev=1402730&r1=1402729&r2=1402730&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/data/ServerColumnUpdate.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/data/ServerColumnUpdate.java Sat Oct 27 00:59:22 2012
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
 package org.apache.accumulo.server.data;
 
 import org.apache.accumulo.core.data.ColumnUpdate;

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/data/ServerMutation.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/data/ServerMutation.java?rev=1402730&r1=1402729&r2=1402730&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/data/ServerMutation.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/data/ServerMutation.java Sat Oct 27 00:59:22 2012
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
 package org.apache.accumulo.server.data;
 
 import static org.apache.accumulo.core.data.Mutation.SERIALIZED_FORMAT.VERSION2;

Propchange: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/ExportTable.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/ImportTable.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/metanalysis/FilterMeta.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/metanalysis/IndexMeta.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/metanalysis/LogFileInputFormat.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/metanalysis/LogFileOutputFormat.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/metanalysis/package-info.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/metanalysis/package-info.java?rev=1402730&r1=1402729&r2=1402730&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/metanalysis/package-info.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/metanalysis/package-info.java Sat Oct 27 00:59:22 2012
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
 /**
  * Provides programs to analyze metadata mutations written to write ahead logs.  
  * 
@@ -15,4 +31,4 @@
  *
  * @since 1.5
  */
-package org.apache.accumulo.server.metanalysis;
\ No newline at end of file
+package org.apache.accumulo.server.metanalysis;

Propchange: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/metanalysis/package-info.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/BulkFailedCopyProcessor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletMutations.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletMutations.java?rev=1402730&r1=1402729&r2=1402730&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletMutations.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletMutations.java Sat Oct 27 00:59:22 2012
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
 package org.apache.accumulo.server.tabletserver;
 
 import java.util.List;

Propchange: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/GenSplits.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/FateStarvationTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/SlowConstraint.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/SparseColumnFamilyTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/TimeoutTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/randomwalk/concurrent/StartAll.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/randomwalk/concurrent/StartAll.java?rev=1402730&r1=1402729&r2=1402730&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/randomwalk/concurrent/StartAll.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/randomwalk/concurrent/StartAll.java Sat Oct 27 00:59:22 2012
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
 package org.apache.accumulo.server.test.randomwalk.concurrent;
 
 import java.util.Properties;

Propchange: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/randomwalk/concurrent/StartAll.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/randomwalk/concurrent/StopTabletServer.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/randomwalk/concurrent/StopTabletServer.java?rev=1402730&r1=1402729&r2=1402730&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/randomwalk/concurrent/StopTabletServer.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/randomwalk/concurrent/StopTabletServer.java Sat Oct 27 00:59:22 2012
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
 package org.apache.accumulo.server.test.randomwalk.concurrent;
 
 import java.util.ArrayList;

Propchange: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/randomwalk/concurrent/StopTabletServer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/CompactFilter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ExportIndex.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: accumulo/trunk/server/src/test/java/org/apache/accumulo/server/data/ServerMutationTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/test/java/org/apache/accumulo/server/data/ServerMutationTest.java?rev=1402730&r1=1402729&r2=1402730&view=diff
==============================================================================
--- accumulo/trunk/server/src/test/java/org/apache/accumulo/server/data/ServerMutationTest.java (original)
+++ accumulo/trunk/server/src/test/java/org/apache/accumulo/server/data/ServerMutationTest.java Sat Oct 27 00:59:22 2012
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
 package org.apache.accumulo.server.data;
 
 import static org.junit.Assert.assertEquals;

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4.2/src:r1402681
  Merged /accumulo/branches/1.4/src:r1402682
  Merged /accumulo/branches/1.4/src/src:r1402682

Propchange: accumulo/trunk/test/compat/japi-compliance/README
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/test/compat/japi-compliance/japi-accumulo-1.4.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/test/compat/japi-compliance/japi-accumulo-1.5.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/test/system/auto/config.py
------------------------------------------------------------------------------
    svn:executable = *

Propchange: accumulo/trunk/test/system/auto/simple/baditerminc.py
------------------------------------------------------------------------------
    svn:executable = *

Propchange: accumulo/trunk/test/system/auto/simple/combiner.py
------------------------------------------------------------------------------
    svn:executable = *

Propchange: accumulo/trunk/test/system/auto/simple/examples.py
------------------------------------------------------------------------------
    svn:executable = *

Propchange: accumulo/trunk/test/system/auto/simple/fateStartvation.py
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/test/system/auto/simple/sparseColumnFamily.py
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/test/system/auto/simple/timeout.py
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: accumulo/trunk/test/system/auto/simple/timeout.py
------------------------------------------------------------------------------
    svn:executable = *

Propchange: accumulo/trunk/test/system/auto/stress/migrations.py
------------------------------------------------------------------------------
    svn:executable = *

Propchange: accumulo/trunk/test/system/randomwalk/bin/reset-cluster.sh
------------------------------------------------------------------------------
    svn:executable = *



Mime
View raw message