changeset 56:c1862433d438 1.0.4

Bump to 1.0.4 review-thread: http://icedtea.classpath.org/pipermail/heapstats/2015-May/000856.html
author KUBOTA Yuji <kubota.yuji@lab.ntt.co.jp>
date Thu, 28 May 2015 15:11:21 +0900
parents bf062115601d
children fd76f06f8e57
files agent/AUTHORS agent/ChangeLog agent/Makefile.in agent/NEWS agent/aclocal.m4 agent/configure agent/configure.ac agent/specs/heapstats_agent.spec agent/src/Makefile.in analyzer/build.properties analyzer/src/jp/co/ntt/oss/heapstats/gui/GUIMain.java
diffstat 11 files changed, 277 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/agent/AUTHORS	Thu May 28 15:10:50 2015 +0900
+++ b/agent/AUTHORS	Thu May 28 15:11:21 2015 +0900
@@ -7,7 +7,7 @@
  Yasumasa Suenaga
  Takahiro Jyoukou
  Shinji Hisano
- Yuji Kubota
+ KUBOTA Yuji
  Shinji Takao
 
 ------------------------------------------------------------
--- a/agent/ChangeLog	Thu May 28 15:10:50 2015 +0900
+++ b/agent/ChangeLog	Thu May 28 15:11:21 2015 +0900
@@ -1,3 +1,7 @@
+2015-05-28 KUBOTA Yuji  <kubota.yuji@lab.ntt.co.jp>
+
+	* Bump to 1.0.4
+
 2015-05-28 KUBOTA Yuji  <kubota.yuji@lab.ntt.co.jp>
 
 	* Bug 2382: Update Private Enterprise Number for SNMP.
--- a/agent/Makefile.in	Thu May 28 15:10:50 2015 +0900
+++ b/agent/Makefile.in	Thu May 28 15:11:21 2015 +0900
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -81,11 +81,12 @@
 DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
 	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/heapstats.conf.in COPYING ./m4/config.guess \
-	./m4/config.sub ./m4/depcomp ./m4/install-sh ./m4/missing \
-	./m4/ltmain.sh $(top_srcdir)/./m4/config.guess \
-	$(top_srcdir)/./m4/config.sub $(top_srcdir)/./m4/install-sh \
-	$(top_srcdir)/./m4/ltmain.sh $(top_srcdir)/./m4/missing
+	$(srcdir)/heapstats.conf.in COPYING ./m4/compile \
+	./m4/config.guess ./m4/config.sub ./m4/depcomp ./m4/install-sh \
+	./m4/missing ./m4/ltmain.sh $(top_srcdir)/./m4/compile \
+	$(top_srcdir)/./m4/config.guess $(top_srcdir)/./m4/config.sub \
+	$(top_srcdir)/./m4/install-sh $(top_srcdir)/./m4/ltmain.sh \
+	$(top_srcdir)/./m4/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -562,10 +563,16 @@
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
@@ -607,9 +614,10 @@
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && ../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
--- a/agent/NEWS	Thu May 28 15:10:50 2015 +0900
+++ b/agent/NEWS	Thu May 28 15:11:21 2015 +0900
@@ -1,3 +1,14 @@
+New in release 1.0.4 (2015-05-28)
+
+- Update official Private Enterprise Number for SNMP.
+ - Change the configured PEN from 123456 to 45156 if you use SNMP trap by your tools.
+- Change default settings to resolve the below bugs.
+ - Bug 2017: JVM may crash with taking interval SnapShot when concurrent GC is occurred.
+  - snapshot_interval is set 0 forcibly if you use concurrent GC.
+ - Bug 2114: Default values are different from binary-builtin and heapstats.conf.
+  - Default values of binary-builtin are changed to same value as the default of heapstats.conf.
+- And fixes some other bugs.
+
 New in release 1.0.3 (2014-08-22)
 
 - HeapStats agent supports systemd/journald.
--- a/agent/aclocal.m4	Thu May 28 15:10:50 2015 +0900
+++ b/agent/aclocal.m4	Thu May 28 15:11:21 2015 +0900
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
@@ -32,10 +32,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.13'
+[am__api_version='1.14'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.13.4], [],
+m4_if([$1], [1.14.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,7 +51,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.13.4])dnl
+[AM_AUTOMAKE_VERSION([1.14.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -438,6 +438,12 @@
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -546,7 +552,48 @@
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -554,7 +601,6 @@
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -772,6 +818,70 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
--- a/agent/configure	Thu May 28 15:10:50 2015 +0900
+++ b/agent/configure	Thu May 28 15:11:21 2015 +0900
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for HeapStats 1.0.3.
+# Generated by GNU Autoconf 2.69 for HeapStats 1.0.4.
 #
 # Report bugs to <heapstats@icedtea.classpath.org>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='HeapStats'
 PACKAGE_TARNAME='heapstats_agent'
-PACKAGE_VERSION='1.0.3'
-PACKAGE_STRING='HeapStats 1.0.3'
+PACKAGE_VERSION='1.0.4'
+PACKAGE_STRING='HeapStats 1.0.4'
 PACKAGE_BUGREPORT='heapstats@icedtea.classpath.org'
 PACKAGE_URL=''
 
@@ -1345,7 +1345,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures HeapStats 1.0.3 to adapt to many kinds of systems.
+\`configure' configures HeapStats 1.0.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1415,7 +1415,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of HeapStats 1.0.3:";;
+     short | recursive ) echo "Configuration of HeapStats 1.0.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1540,7 +1540,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-HeapStats configure 1.0.3
+HeapStats configure 1.0.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2084,7 +2084,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by HeapStats $as_me 1.0.3, which was
+It was created by HeapStats $as_me 1.0.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2466,7 +2466,7 @@
 
 
 
-am__api_version='1.13'
+am__api_version='1.14'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2952,7 +2952,7 @@
 
 # Define the identity of the package.
  PACKAGE='heapstats_agent'
- VERSION='1.0.3'
+ VERSION='1.0.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3003,6 +3003,47 @@
 
 
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
@@ -4354,6 +4395,65 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -18891,7 +18991,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by HeapStats $as_me 1.0.3, which was
+This file was extended by HeapStats $as_me 1.0.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18948,7 +19048,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-HeapStats config.status 1.0.3
+HeapStats config.status 1.0.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
--- a/agent/configure.ac	Thu May 28 15:10:50 2015 +0900
+++ b/agent/configure.ac	Thu May 28 15:11:21 2015 +0900
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([HeapStats],[1.0.3],[heapstats@icedtea.classpath.org],[heapstats_agent])
+AC_INIT([HeapStats],[1.0.4],[heapstats@icedtea.classpath.org],[heapstats_agent])
 AC_CONFIG_SRCDIR([./src])
 AC_CONFIG_AUX_DIR([./m4])
 AC_CONFIG_MACRO_DIR([./m4])
--- a/agent/specs/heapstats_agent.spec	Thu May 28 15:10:50 2015 +0900
+++ b/agent/specs/heapstats_agent.spec	Thu May 28 15:11:21 2015 +0900
@@ -42,7 +42,7 @@
 
 Summary: A Java programming language debugging tool.
 Name: heapstats_agent
-Version: 1.0.3
+Version: 1.0.4
 Release: 0%{?target_processor:%{target_processor}}%{?dist:%{dist}}%{!?dist:.el5}
 License: GPLv2
 Vendor: NTT OSS Center
@@ -66,8 +66,8 @@
 BuildRequires: libtool
 
 %description
-this program analyze running information in JVM.
-Copyright (C) 2011-2014 Nippon Telegraph and Telephone Corporation.
+this program analyzes running information in JVM.
+Copyright (C) 2011-2015 Nippon Telegraph and Telephone Corporation.
 
 %prep
 %setup -q -n heapstats-1.0/agent
@@ -112,6 +112,16 @@
 /usr/share/snmp/mibs/HeapStatsMibs.txt
 
 %changelog
+* Fri May 28 2015 KUBOTA Yuji <kubota.yuji@lab.ntt.co.jp> 1.0.4-0
+- Update official Private Enterprise Number for SNMP.
+ - Change the configured PEN from 123456 to 45156 if you use SNMP trap by your tools.
+- Change default settings to resolve the below bugs.
+ - Bug 2017: JVM may crash with taking interval SnapShot when concurrent GC is occurred.
+  - snapshot_interval is set 0 forcibly if you use concurrent GC.
+ - Bug 2114: Default values are different from binary-builtin and heapstats.conf.
+  - Default values of binary-builtin are changed to same value as the default of heapstats.conf.
+- And fixes some other bugs.
+
 * Fri Aug 22 2014 KUBOTA Yuji <kubota.yuji@lab.ntt.co.jp> 1.0.3-0
 - HeapStats agent supports systemd/journald.
 - Some bug fixes.
--- a/agent/src/Makefile.in	Thu May 28 15:10:50 2015 +0900
+++ b/agent/src/Makefile.in	Thu May 28 15:11:21 2015 +0900
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
--- a/analyzer/build.properties	Thu May 28 15:10:50 2015 +0900
+++ b/analyzer/build.properties	Thu May 28 15:11:21 2015 +0900
@@ -1,5 +1,5 @@
 #Variable
-version=1.0.3
+version=1.0.4
 source=1.6
 target=1.6
 
--- a/analyzer/src/jp/co/ntt/oss/heapstats/gui/GUIMain.java	Thu May 28 15:10:50 2015 +0900
+++ b/analyzer/src/jp/co/ntt/oss/heapstats/gui/GUIMain.java	Thu May 28 15:11:21 2015 +0900
@@ -2,7 +2,7 @@
  * GUIMain.java
  * Created on 2011/09/07
  *
- * Copyright (C) 2011-2014 Nippon Telegraph and Telephone Corporation
+ * Copyright (C) 2011-2015 Nippon Telegraph and Telephone Corporation
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -584,11 +584,11 @@
             } else if (eventSource.equals(aboutHeapStats)) {
                 // Version Dialog
                 StringBuilder buf = new StringBuilder();
-                buf.append("\n\n  Version: 1.0.3\n\n");
+                buf.append("\n\n  Version: 1.0.4\n\n");
                 buf.append("HeapStats is licensed under the GNU General Public License version 2.\n\n");
                 buf.append("about:license\n");
                 buf.append("  JFreeChart  :  the GNU Lesser General Public License\n\n");
-                buf.append("  Copyright (C) 2011-2014 Nippon Telegraph and ");
+                buf.append("  Copyright (C) 2011-2015 Nippon Telegraph and ");
                 buf.append("Telephone Corporation\n\n");
 
                 JLabel title = new JLabel("  HeapStats Analyzer\n\n\n");