# HG changeset patch
# User coleenp
# Date 1410483844 0
# Node ID b2029969cc16bf63dcf8aa93ae6ebbab1a30bf4b
# Parent  ed3d653e4012d472a4c2b6107b7f152b530c3f34# Parent  dce3f772de9f79ec11e860c13d65cb10dfa6330d
Merge

diff -r ed3d653e4012 -r b2029969cc16 src/share/vm/gc_interface/gcCause.cpp
--- a/src/share/vm/gc_interface/gcCause.cpp	Thu Sep 04 14:50:31 2014 -0400
+++ b/src/share/vm/gc_interface/gcCause.cpp	Fri Sep 12 01:04:04 2014 +0000
@@ -54,6 +54,9 @@
     case _wb_young_gc:
       return "WhiteBox Initiated Young GC";
 
+    case _update_allocation_context_stats:
+      return "Update Allocation Context Stats";
+
     case _no_gc:
       return "No GC";
 
diff -r ed3d653e4012 -r b2029969cc16 src/share/vm/gc_interface/gcCause.hpp
--- a/src/share/vm/gc_interface/gcCause.hpp	Thu Sep 04 14:50:31 2014 -0400
+++ b/src/share/vm/gc_interface/gcCause.hpp	Fri Sep 12 01:04:04 2014 +0000
@@ -47,6 +47,7 @@
     _heap_inspection,
     _heap_dump,
     _wb_young_gc,
+    _update_allocation_context_stats,
 
     /* implementation independent, but reserved for GC use */
     _no_gc,