aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-04-10 12:00:01 +0200
committerFredrik Gustafsson <[email protected]>2013-04-10 12:00:01 +0200
commita5a2dc0c67defb34fb7c363a07ec4064b28148c9 (patch)
treeb6324e94adfe86bc78ef5109fc242156193fd02c /erts
parent6006a4cb7b3aa6f7c2ca31ae4b0a46a446037c96 (diff)
parent92727b2d911362c1efc8df84cf685c91f154e15a (diff)
downloadotp-a5a2dc0c67defb34fb7c363a07ec4064b28148c9.tar.gz
otp-a5a2dc0c67defb34fb7c363a07ec4064b28148c9.tar.bz2
otp-a5a2dc0c67defb34fb7c363a07ec4064b28148c9.zip
Merge branch 'maint'
Conflicts: erts/preloaded/ebin/erl_prim_loader.beam erts/preloaded/ebin/erlang.beam erts/preloaded/ebin/erts_internal.beam erts/preloaded/ebin/init.beam erts/preloaded/ebin/otp_ring0.beam erts/preloaded/ebin/prim_file.beam erts/preloaded/ebin/prim_inet.beam erts/preloaded/ebin/prim_zip.beam erts/preloaded/ebin/zlib.beam
Diffstat (limited to 'erts')
-rw-r--r--erts/preloaded/ebin/erl_prim_loader.beambin54564 -> 54564 bytes
-rw-r--r--erts/preloaded/ebin/erlang.beambin93388 -> 93388 bytes
-rw-r--r--erts/preloaded/ebin/erts_internal.beambin3644 -> 3644 bytes
-rw-r--r--erts/preloaded/ebin/init.beambin48672 -> 48672 bytes
-rw-r--r--erts/preloaded/ebin/otp_ring0.beambin1476 -> 1476 bytes
-rw-r--r--erts/preloaded/ebin/prim_file.beambin44280 -> 44280 bytes
-rw-r--r--erts/preloaded/ebin/prim_inet.beambin70084 -> 70084 bytes
-rw-r--r--erts/preloaded/ebin/prim_zip.beambin23444 -> 23444 bytes
-rw-r--r--erts/preloaded/ebin/zlib.beambin12812 -> 12812 bytes
-rw-r--r--erts/preloaded/src/erlang.erl4
10 files changed, 2 insertions, 2 deletions
diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam
index 2bef3b5bb7..059b8dd652 100644
--- a/erts/preloaded/ebin/erl_prim_loader.beam
+++ b/erts/preloaded/ebin/erl_prim_loader.beam
Binary files differ
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index 790cfcca6d..a86d1d3473 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
Binary files differ
diff --git a/erts/preloaded/ebin/erts_internal.beam b/erts/preloaded/ebin/erts_internal.beam
index 12bc815e1d..e1db170b2a 100644
--- a/erts/preloaded/ebin/erts_internal.beam
+++ b/erts/preloaded/ebin/erts_internal.beam
Binary files differ
diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam
index 964a993817..49c041ab4c 100644
--- a/erts/preloaded/ebin/init.beam
+++ b/erts/preloaded/ebin/init.beam
Binary files differ
diff --git a/erts/preloaded/ebin/otp_ring0.beam b/erts/preloaded/ebin/otp_ring0.beam
index 51211482ad..868d51390d 100644
--- a/erts/preloaded/ebin/otp_ring0.beam
+++ b/erts/preloaded/ebin/otp_ring0.beam
Binary files differ
diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam
index 95e4a5de55..689d417376 100644
--- a/erts/preloaded/ebin/prim_file.beam
+++ b/erts/preloaded/ebin/prim_file.beam
Binary files differ
diff --git a/erts/preloaded/ebin/prim_inet.beam b/erts/preloaded/ebin/prim_inet.beam
index c0cde26217..5cd013b865 100644
--- a/erts/preloaded/ebin/prim_inet.beam
+++ b/erts/preloaded/ebin/prim_inet.beam
Binary files differ
diff --git a/erts/preloaded/ebin/prim_zip.beam b/erts/preloaded/ebin/prim_zip.beam
index b96b612df8..109d2a4208 100644
--- a/erts/preloaded/ebin/prim_zip.beam
+++ b/erts/preloaded/ebin/prim_zip.beam
Binary files differ
diff --git a/erts/preloaded/ebin/zlib.beam b/erts/preloaded/ebin/zlib.beam
index 68f5bb8d46..6a093c9b26 100644
--- a/erts/preloaded/ebin/zlib.beam
+++ b/erts/preloaded/ebin/zlib.beam
Binary files differ
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index a88a8831ea..fefe0f21e0 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -1785,7 +1785,7 @@ process_flag(_Flag, _Value) ->
links |
last_calls |
memory |
- message_que_len |
+ message_queue_len |
messages |
min_heap_size |
min_bin_vheap_size |
@@ -1824,7 +1824,7 @@ process_flag(_Flag, _Value) ->
{links, PidsAndPorts :: [pid() | port()]} |
{last_calls, false | (Calls :: [mfa()])} |
{memory, Size :: non_neg_integer()} |
- {message_que_len, MessageQueueLen :: non_neg_integer()} |
+ {message_queue_len, MessageQueueLen :: non_neg_integer()} |
{messages, MessageQueue :: [term()]} |
{min_heap_size, MinHeapSize :: non_neg_integer()} |
{min_bin_vheap_size, MinBinVHeapSize :: non_neg_integer()} |