accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [6/6] accumulo git commit: ACCUMULO-3503 Remove accidental merge to master
Date Wed, 11 Feb 2015 21:13:26 GMT
ACCUMULO-3503 Remove accidental merge to master

This change only affects the 1.6 branch


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

Branch: refs/heads/master
Commit: 37847be185578013e506c6b5ac2b128a8111cbbd
Parents: 5663fe4
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Wed Feb 11 15:59:50 2015 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Wed Feb 11 16:09:46 2015 -0500

----------------------------------------------------------------------
 server/tracer/src/main/scripts/generate-thrift.sh | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/37847be1/server/tracer/src/main/scripts/generate-thrift.sh
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/scripts/generate-thrift.sh b/server/tracer/src/main/scripts/generate-thrift.sh
index 31acac3..ab916ec 100755
--- a/server/tracer/src/main/scripts/generate-thrift.sh
+++ b/server/tracer/src/main/scripts/generate-thrift.sh
@@ -22,8 +22,3 @@ 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