flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmetz...@apache.org
Subject [38/39] git commit: Fix broken history due to misplaced google load js
Date Sat, 09 Aug 2014 12:40:09 GMT
Fix broken history due to misplaced google load js


Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/3f1e220c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/3f1e220c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/3f1e220c

Branch: refs/heads/travis_test
Commit: 3f1e220cfa9a1f58ef4227e6024cf2296429f081
Parents: b63beba
Author: Robert Metzger <rmetzger@apache.org>
Authored: Sun Aug 3 14:39:12 2014 +0200
Committer: Robert Metzger <rmetzger@apache.org>
Committed: Sat Aug 9 14:36:31 2014 +0200

----------------------------------------------------------------------
 flink-runtime/resources/web-docs-infoserver/analyze.html | 7 ++++---
 tools/prepare_release.sh                                 | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/3f1e220c/flink-runtime/resources/web-docs-infoserver/analyze.html
----------------------------------------------------------------------
diff --git a/flink-runtime/resources/web-docs-infoserver/analyze.html b/flink-runtime/resources/web-docs-infoserver/analyze.html
index 034e069..cf1b09e 100755
--- a/flink-runtime/resources/web-docs-infoserver/analyze.html
+++ b/flink-runtime/resources/web-docs-infoserver/analyze.html
@@ -19,6 +19,10 @@
     <link rel="stylesheet" type="text/css" href="css/nephelefrontend.css" />
     <link rel="stylesheet" type="text/css" href="css/timeline.css">
     
+    <!-- Scripts from Google -->
+    <!-- This should be loaded first to ensure the availability of google.load for the
scripts -->
+    <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+    
     <!-- Scripts from Bootstrap -->
     <script src="js/jquery-1.10.2.js"></script>
     <script src="js/bootstrap.js"></script>
@@ -31,9 +35,6 @@
     <script type="text/javascript" src="js/helpers.js"></script>
     <script type="text/javascript" src="js/analyzer.js"></script>
     
-    <!-- Scripts from Google -->
-    <script type="text/javascript" src="https://www.google.com/jsapi"></script>
-    
     <!-- Load Menu -->
 	<script type="text/javascript">
 	$(document).ready(function() {

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/3f1e220c/tools/prepare_release.sh
----------------------------------------------------------------------
diff --git a/tools/prepare_release.sh b/tools/prepare_release.sh
index 17354b9..7accbea 100644
--- a/tools/prepare_release.sh
+++ b/tools/prepare_release.sh
@@ -19,5 +19,5 @@
 
 echo "Updating version from $OLD_VERSION to $NEW_VERSION"
 
-find .. -name 'pom.xml' -type f -exec sed -i 's#<version>$OLD_VERSION</version>#<version>$NEW_VERSION</version>#'
{} \;
+find flink -name 'pom.xml' -type f -exec sed -i 's#<version>$OLD_VERSION</version>#<version>$NEW_VERSION</version>#'
{} \;
 


Mime
View raw message