accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [5/5] accumulo git commit: Merge branch '1.6'
Date Wed, 21 Jan 2015 18:15:51 GMT
Merge branch '1.6'

Conflicts:
	server/tracer/src/main/scripts/generate-thrift.sh


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

Branch: refs/heads/master
Commit: fed4ae87db103738b62f2b837cd2d1bf9f991983
Parents: 2b4d808 2022d7c
Author: Josh Elser <elserj@apache.org>
Authored: Wed Jan 21 13:14:38 2015 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Wed Jan 21 13:14:38 2015 -0500

----------------------------------------------------------------------
 .../accumulo/minicluster/MiniAccumuloConfig.java    | 16 ----------------
 server/tracer/src/main/scripts/generate-thrift.sh   |  5 +++++
 .../org/apache/accumulo/test/ExistingMacIT.java     | 11 +++++------
 3 files changed, 10 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/fed4ae87/server/tracer/src/main/scripts/generate-thrift.sh
----------------------------------------------------------------------
diff --cc server/tracer/src/main/scripts/generate-thrift.sh
index ab916ec,0000000..3daa98e
mode 100755,000000..100755
--- a/server/tracer/src/main/scripts/generate-thrift.sh
+++ b/server/tracer/src/main/scripts/generate-thrift.sh
@@@ -1,24 -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


Mime
View raw message