accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [2/5] accumulo git commit: ACCUMULO-3503 Using literal newlines for sed. Works in both mac and linux.
Date Wed, 21 Jan 2015 18:15:48 GMT
ACCUMULO-3503 Using literal newlines for sed. Works in both mac and linux.


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

Branch: refs/heads/master
Commit: 00ba1a10723a204fe74e08392f6c426916165179
Parents: 7446d60
Author: Corey J. Nolet <cjnolet@gmail.com>
Authored: Tue Jan 20 22:16:27 2015 -0500
Committer: Corey J. Nolet <cjnolet@gmail.com>
Committed: Tue Jan 20 22:16:27 2015 -0500

----------------------------------------------------------------------
 trace/src/main/scripts/generate-thrift.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/00ba1a10/trace/src/main/scripts/generate-thrift.sh
----------------------------------------------------------------------
diff --git a/trace/src/main/scripts/generate-thrift.sh b/trace/src/main/scripts/generate-thrift.sh
index 9e1f1f3..96116f8 100755
--- a/trace/src/main/scripts/generate-thrift.sh
+++ b/trace/src/main/scripts/generate-thrift.sh
@@ -23,4 +23,7 @@ PACKAGES_TO_GENERATE=(trace)
 . ../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\n\n  private static final long serialVersionUID
= -4659975753252858243l; \/\/ See ACCUMULO-3132\n'/" src/main/java/org/apache/accumulo/trace/thrift/TInfo.java
+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