accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [1/5] accumulo git commit: ACCUMULO-3503 Newlines are not being properly interpolated in the generate_thrift.sh on Mac.
Date Wed, 21 Jan 2015 18:15:47 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.6 00ba1a107 -> 2022d7c08
  refs/heads/master 2b4d80812 -> fed4ae87d


ACCUMULO-3503 Newlines are not being properly interpolated in the generate_thrift.sh on Mac.


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

Branch: refs/heads/master
Commit: 7446d604eb41cc5925c74edf206ad76965a176df
Parents: 21ab055
Author: Corey J. Nolet <cjnolet@gmail.com>
Authored: Tue Jan 20 21:34:56 2015 -0500
Committer: Corey J. Nolet <cjnolet@gmail.com>
Committed: Tue Jan 20 21:34:56 2015 -0500

----------------------------------------------------------------------
 trace/src/main/scripts/generate-thrift.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


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


Mime
View raw message