Merge remote-tracking branch 'github/master' into github_master

Conflicts: util/release_tarball-240.sh
ovis-hpc · May 23, 2015 · 4923cce · 4923cce
2 parents 8a0b662 + e71324b
commit 4923cce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ----
 ## What is OVIS?
-See [OVIS wiki](ovis.ca.sandia.gov)
+See [OVIS wiki](https://ovis.ca.sandia.gov/mediawiki/index.php)
 
 > OVIS is a collection of sub-projects that, as an aggregate, provide HPC targeted capabilities for lightweight monitoring and high performance analysis and visualization of monitored information and events.
 

diff --git a/util/release_tarball-240.sh b/util/release_tarball-240.sh
@@ -6,7 +6,9 @@ if ! test -f m4/Ovis-top.m4; then
 fi
 REPO_DIR=`pwd`
 OUTPUT_DIR=`pwd`/Release
+
 BRANCH_NAME=v2.4.2
+
 # Will get this from git in the future
 VERSION=2.4.2