Merge branch 'upstream-3.4' into 'OVIS-3.4'

3.4.6 version number version number bump See merge request !666
ovis-hpc · Oct 25, 2017 · bffd743 · bffd743
2 parents 373d822 + 86adb57
commit bffd743
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.63)
-AC_INIT(ovis, 3.4.5, ovis-help@sandia.gov)
+AC_INIT(ovis, 3.4.6, ovis-help@sandia.gov)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([m4/Ovis-top.m4])
 AC_CONFIG_AUX_DIR(config)

diff --git a/ldms/configure.ac b/ldms/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.63)
-AC_INIT(ovis-ldms, 3.4.5, ovis-help@sandia.gov)
+AC_INIT(ovis-ldms, 3.4.6, ovis-help@sandia.gov)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src/core/ldms.h])
 AC_CONFIG_AUX_DIR(config)

diff --git a/lib/configure.ac b/lib/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.63)
-AC_INIT([ovis-lib], 3.4.5, ovis-help@sandia.gov)
+AC_INIT([ovis-lib], 3.4.6, ovis-help@sandia.gov)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER(config.h)