Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a139e7a7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a139e7a7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a139e7a7 Branch: refs/heads/master Commit: a139e7a754f4e01024fcf0ec10f0ba141e516594 Parents: a0dbe56 67dd532 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Jan 22 15:18:57 2015 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Jan 22 15:18:57 2015 -0500 ---------------------------------------------------------------------- server/tracer/src/main/scripts/generate-thrift.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/a139e7a7/server/tracer/src/main/scripts/generate-thrift.sh ---------------------------------------------------------------------- diff --cc server/tracer/src/main/scripts/generate-thrift.sh index 3daa98e,0000000..31acac3 mode 100755,000000..100755 --- a/server/tracer/src/main/scripts/generate-thrift.sh +++ b/server/tracer/src/main/scripts/generate-thrift.sh @@@ -1,29 -1,0 +1,29 @@@ +#! /usr/bin/env bash + +# 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. + +# This script will regenerate the thrift code for accumulo-trace. +INCLUDED_MODULES=(../../core) +BASE_OUTPUT_PACKAGE='org.apache.accumulo' +PACKAGES_TO_GENERATE=(tracer) + +. ../../core/src/main/scripts/generate-thrift.sh + +# Ensure serialVersionUID stays the same for all 1.6.x versions (see ACCUMULO-3433, ACCUMULO-3132) +sed -i -e 's/\(public class TInfo .*\)$/\1\ +\ + private static final long serialVersionUID = -4659975753252858243l; \/\/ See ACCUMULO-3132\ - /' src/main/java/org/apache/accumulo/trace/thrift/TInfo.java ++/' src/main/java/org/apache/accumulo/trace/thrift/TInfo.java
