Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: psyeugenic/otp
...
head fork: psyeugenic/otp
This comparison is big! We’re only showing the most recent 250 commits
Commits on Mar 15, 2012
@tuncer tuncer Fix typos in ct getting_started_chapter.xml 1eca92e
Gustav Simonsson Add generation of Erlang callback functions to avoid compiler warnings
of generated Erlang source code. See seq12023.
217fd34
@pekadan pekadan Merge remote branch 'origin/peppe/common_test/otp-9634_9659' into maint
* origin/peppe/common_test/otp-9634_9659:
  Change the option name 'unique_priv_dir' to 'create_priv_dir'
  Add test suite for the unique_priv_dir feature
  Make it possible to use unique priv_dir names
  Create entry for every repeated test in index.html

OTP-9634
OTP-9659
1748c9e
@pekadan pekadan Merge remote branch 'origin/peppe/common_test/otp-9666' into maint
* origin/peppe/common_test/otp-9666:
  Set correct group leader for end_per_testcase process after tc timeout

OTP-9666
37827c8
@sverker sverker erts: Fix memory corruption when reading topology info
If the number of processors actually found while reading sysfs
is lower than the configured value, we realloc() the cpuinfo array
to the smaller size, but we then iterate it using the original
configured size, thus corrupting memory beyond the allocated
block.
8c34a2d
Commits on Mar 16, 2012
@dgud dgud [wx] Fix listctrl issues
Wrong arguments / return values in:
hitTest getItemPosition and getItemRect
37fb668
@dgud dgud [wx] Add more types
The hardcoded records wxMouseState and wxHtmlLinkInfo did have
types as comments. (changes in code gen is in prev commit)
8d5372d
Gustav Simonsson Merge branch 'rj/fix-global-spec' into maint
* rj/fix-global-spec:
  Improve global:re_register_name/2,3 spec
  Fix global:{random_exit_name,random_notify_name}/3 spec
e5cc75f
Gustav Simonsson Merge branch 'rj/minor-doc-improvements' into maint
* rj/minor-doc-improvements:
  Remove dashes from error_logger doc
  Add start/0,1 and help/0 to etop's doc
  Remove/add extra/missing white spaces
dbc73d9
Gustav Simonsson Merge branch 'rj/fix-misc-doc-typos' into maint
* rj/fix-misc-doc-typos:
  Fix a code snippet and two typos in the doc
af311d0
Gustav Simonsson Merge branch 'rj/fix-supervisor-shutdown-doc' into maint
* rj/fix-supervisor-shutdown-doc:
  Fix small typo in kernel app doc
  Cosmetic: split very long lines from supervisor doc
  Fix supervisor doc: Shutdown, MaxR and MaxT type specs
  Add the type restrictions in the code comments
  Remove trailing spaces

OTP-9987
3087769
@psyeugenic prim_inet: Catch system_limit in open_port
Will catch system_limit and return error tuple instead. An uncaught
exception would be an incorrect behaviour. This problem would occur
for gen_tcp:listen/1,2 for example.
8412801
@psyeugenic gen_tcp: Use correct specs for accept and listen 2c1d754
@psyeugenic Update preloaded prim_inet.beam 65ba37d
Commits on Mar 19, 2012
@sirihansen sirihansen [reltool] Add more test cases and fix bugs
OTP-9794

The following test cases are added for the inteface from GUI to
reltool_server:
    * get_config
    * get_apps
    * set_app_and_undo
    * set_apps_and_undo
    * load_config_and_undo
    * reset_config_and_undo
    * save_config

The following bugs were found and corrected:
    * If set_apps failed, then the state of reltool_server would not
      be reset to how it was before the failing operation - and every
      operation done afterwards would also (seem to) fail.
    * undo_config did not work after reset_config - since faulty #sys
      record was stored as old_sys.
    * undo_config did not work after set_app (used when changing the
      content of an application from the GUI) - since old_sys was not
      set. Also old_status was not set causing possible warnings to
      disappear.
    * undo_config did not work after set_apps (used e.g. when
      excluding or including an application from the GUI) - since
      old_sys was not set. Also old_status was not set causing
      possible warnings to disappear.
40014d4
@sirihansen sirihansen [reltool] Add test of dependencies derived through calls to external …
…apps

OTP-9794

This is a test of the mechanism with which reltool_server decides
which applications to include and not, based on function calls between
applications. This is also the mechanism which forms the base for the
application- and module dependency graphs.
e610c1e
@sirihansen sirihansen [reltool] Ensure that tests do not try to start node if target was no…
…t created

OTP-9794

Some test cases in reltool_server_SUITE tried to create a target
system and then start a node running this system. If creation of the
target system failed, an attempt would still be made to start the
node. This has been corrected so the test is immediately terminated if
the target system could not be created.
06ea8c9
@sirihansen sirihansen [reltool] Add test case for reltool_server:get_mod
OTP-9794

This test case revealed a bug that occurs when calling
reltool_server:get_mod after reltool_server:undo_config. get_mod reads
from the module table (ets) and not from the reltool_server state,
while undo_config only changes the state. This bug has been corrected,
so undo_config now updates both state and tables (it does the same as
set_sys).
6102804
@sirihansen sirihansen [reltool] Add more tests
OTP-9794

Test cases are added for the following functions:
* reltool_server:get_sys
* reltool_server:set_sys
* reltool_server:get_status
* reltool_server:gen_rel_files
* reltool:eval_target_spec
* reltool:get_server
f515a08
@sirihansen sirihansen [reltool] Add more GUI tests
OTP-9794

This commit adds a test suite for manual testing of the reltool
GUI. By use of test_server:break/1 function, it guides the user
through a set of tests in the GUI.

Some minor checks are also added to the automatic GUI test,
reltool_wx_SUITE.
3fef8ee
@sirihansen sirihansen [reltool] Add tests for sorting of applications in .rel and .script f…
…iles

OTP-9794

Test cases create_release_sort and create_script_sort are added. The
test are temporarily skipped since they detected quite a few bugs that
will be corrected with OTP-9792.

The following bug is corrected in this commit:'
reltool_server did not recognize {App,InclApps} inside a 'rel'
specification in the reltool config, e.g.
{rel, "myrel", "1.0", [{myapp,[app2]}]}.
5235731
@sirihansen sirihansen [reltool] Add test cases for handling of escripts
OTP-9794
OTP-9968

The following test cases are added:
* create_standalone_beam
* create_standalone_app
* create_multiple_standalone
* load_config_escript_path
* load_config_same_escript_source
* load_config_same_escript_beam
* load_config_add_escript

Most of them are temporarily skipped since they re-produce known
problems that will be corrected in a later commit.
e3bb312
@sirihansen sirihansen [reltool] Update state and tables consistently for all types of confi…
…g changes

OTP-9794
OTP-9968

The main idea behind the data structure in reltool_server is that the
state shall reflect what is explicitly configured, and the tables
shall contain this configuration plus everything that is derived. In
some cases, however, this was not the complete truth:

* the application table was never read
* the module table was never updated on undo
* the state contained a lot more than what was explicitly configured

This commit re-writes major parts of the reltool_server for the sake
of unifying the way the state and tables are updated:

* The list of applications in the state now only contains those
  applications and modules for which there are explicit settings in
  the configuration (given at startup or changed from the GUI)

* When changing any bit of the configuration, the tables are always
  emptied and every part is derived again from the configuration found
  in the state

* All configuration changes now cause a re-read of the file system,
  meaning that if something has changed in the file system it will be
  reflected in the result of the configuration change. This is the
  case even if no file system related configuration is changed
  (e.g. root dir or lib dirs)
  (*POSSIBLE INCOMPATIBILITY*)

* Requests for applications and modules from the GUI now always read
  the tables, not the state

* When loading a new configuration file via the GUI, the old
  configuration is completly scratched, and only the new is valid
  (*POSSIBLE INCOMPATIBILITY*)

* The handling of escripts which include archives of applications is
  changed to always produce one #app record for the escript in
  addition to one for each inlined application. All modules are listed
  as parts of the inlined application where it belongs and not as part
  of the escript's #app record. This is a temporary solution which
  will be modified and improved.

The following bugs are corrected by this commit:

* Loading a config which contains an escript via the GUI menu did not
  produce the same #app record as when loading the same configuration
  at reltool start. Paths, version and label could differ.

* Loading config with same escript (source) twice caused reltool to
  add same module twice in #app.mods

* Loading config with same escript (inlined beam) twice caused reltool
  to fail saying module is included by two different applications

* Loading config which in addition to an existing escript also adds
  another escript for which the name sorts before the existing one
  would cause reltool to fail saying "Application name clash"
6f5e3e1
@sirihansen sirihansen [reltool] Fix badmatch when starting GUI
OTP-9792

Start of reltool GUI sometimes crashes with a badmatch in
reltool_sys_win:do_init/1 because the #sys record fetched with
reltool_server:get_sys/1 differs from the #sys record returned from
reltool_server:start_link/1. This has been
corrected. reltool_server:start_link/1 no longer retuns the #sys
record.
0bc4760
@sirihansen sirihansen [reltool] Link together escript with inlined application
OTP-9968

Make sure that inlined applications in an escript is included/excluded
as the escript itself, and forbid explicit configuration of the
inlined application.
a524046
@sirihansen sirihansen [reltool] Fix rollback and undo
OTP-9794

Backup old configuration before starting re-configuration so rollback
is possible if configuration fails.

Store last configuration including derivates so undo does no longer
need to refresh and analyse everything from disk.
c714eff
@sirihansen sirihansen [reltool] Improve error handling
OTP-9794

Stopping configuration (throw/catch) at first error instead of
continuing through all steps and then returning the error at the
end.

Start of reltool_server will no longer succeed if the configuration
causes an error.

reltool:get_status can only return {error,Reason} in the case where
the reltool_server has terminated. In all other cases it will return
{ok,Warnings}.

Bug fix in this commit:
* warnings are no longer duplicated in pop-up or return from reltool_server
537773c
@sirihansen sirihansen [reltool] Unset ERL_FLAGS when running escript from reltool_server_SUITE
OTP-9794

Some escript tests in reltool_server_SUITE failed if ERL_FLAGS was set
to enable smp. The reason is that the test expected smp_support to be
false, since the argument "-smp disable" is stated in the %%!-line of
the escript. However, ERL_FLAGS will override the arguments in the
escript so the result could not be truested.
70b56b1
@sirihansen sirihansen [reltool] Cleanup test code
OTP-9794

Remove some unused code from reltool test.
a3a7c35
@sirihansen sirihansen [reltool] Display warnings continously in GUI
OTP-9967

All active warnings are now displayed in a specific warning list at
the bottom of the sys windows. Warnings do no longer cause popup
dialogs during configuration.

The reason for this is to avoid the same warning to pop up many
times. This would happen since each configuration change now causes a
fresh reading of the file system - and thus each warning would be
detected each time the configuration was changed.

reltool_manual_gui_SUITE is updated to test the new functionality.
2be5415
@sirihansen sirihansen [reltool] Move tables out of common record
OTP-9794

This is a minor change, in order to keep tables private to
reltool_server.
3f42375
@sirihansen sirihansen [reltool] Fix type spec and doc for app() and mod()
OTP-9792

Also correct documentation of reltool:install/2: first argument is
RelName, not Server.
048c28b
@sirihansen sirihansen [reltool] Always return warnings as flat strings
OTP-9794
50bc03b
@sirihansen sirihansen [reltool] Just warn if same module occurs twice in .app file
OTP-9792

Earlier this would cause an error with reason
"Module xxx potentially included by two different applications: yyy and yyy."

This is now changed so it will only be a warning saying that the
module is duplicated in the .app file.
dac9494
@sirihansen sirihansen [reltool] Fix problems with sorting of applications
OTP-9792

The following problems have been solved:

* reltool_target:do_merge_apps - in recursive calls to this function,
  the accumulator was reverted each time causing the order of
  applications listed after kernel and stdlib in the rel specification
  in the configuration to sometimes be messed up.

* There are several ways to specify wich applications to include in an
  application:
  1) in the .app file for the including applications
  2a) in the .rel file, when listing applications
  2b) in the rel specification in the reltool configuration

  2a (systools) and 2b (reltool) should have the same effect and
  overwrite 1.

  According to the documentation of systools (sasl), the default value
  in 2a is an empty list. This should mean that if included
  applications are not mentioned in the .rel file, then any included
  application listed in the .app file will be disregarded. This is NOT
  the way systools actually works. The implementation sets the default
  for the .rel file to the same list as in the .app file.

  Reltool earlier implemented 2b as described in the systools
  documentation. However, after some discussion we decided to change
  this so that reltool handles 2b in the same way as systools handles
  2a since this seems more intuitive. The sasl documentation will be
  altered accordingly (internal ref OTP-9980).

* If the rel specification in the reltool configuration explicitly
  specified included applications to be an empty list, and the .app
  file had a non-empty list, then the empty list from the rel
  specification was discarded. This has been corrected so the rel
  specification now, if set, always overwrites the value of
  included_applications in the .app file.

* reltool would earlier add load instructions in the script/boot files
  for ALL modules in the ebin directory of an application even if
  mod_cond was set to app (include only modules listed in the .app
  file). This has been corrected - now only modules with
  #mod.is_included==true are loaded.

* reltool would earlier add start instructions in the script/boot file
  for included applications. This has been corrected - included
  applications shall only be loaded since the including application is
  responsible for starting them.
ba3e53e
@sirihansen sirihansen [sasl] Doc that included applications in .rel defaults to same as in …
….app

OTP-9980

Sasl documentation earlier said that the InclApps parameters in a .rel
file defaults to the empty list. This is not correct. It defaults to
the same value as specified in the .app file.
f294d20
@sirihansen sirihansen [sasl] Sort applications used by other applications correctly in .script
OTP-9984

Applications that are listed in {applications,Apps} in the app file
were not sorted correctly in the script file. They were loaded/started
in the reverse order of how they were listed in the .app file.

This is corrected so they are now sorted (internally between each
other) in the same way as they are listed in the .rel file.
8233c6e
@sirihansen sirihansen [reltool] Remove skip statement for test that failed due to stdlib error
The stdlib error has been corrected in a previous commit so the
failing test (reltool_server_SUITE:create_script_sort) can be
un-skipped.
20ef6a7
@pekadan pekadan Run hooks for non-existing config functions ea23dbf
@pekadan pekadan Change ct_init/end_per_group to init/end_per_group
OTP-9986
b411aa5
@pekadan pekadan Use calls to ct_framework:init/end_per_suite for configuration
Now that calls to ct_framework:init/end_per_suite take place
whenever init/end_per_suite is missing in the test suite,
these calls should trigger init/end_tc to perform configuration
(such as calling calling CTH functions, suite/0, etc).
2409000
@pekadan pekadan Fix bug in handling ct_hooks start arguments 86acf3b
@pekadan pekadan Introduce new test suite for CTHs d4d4792
@pekadan pekadan Fix error with group config deleted before post_end_per_group
OTP-9989

Also improve ct_hooks test suite.
7b16f86
@bmk bmk Merge branch 'bmk/megaco/megaco31601_integration/r15' into maint 662e3ff
@sirihansen sirihansen [reltool] Fix GUI problems on Windows
The new warning list did not work on Windows. It could not display
tooltips for each warning and the popup window would always disappear
behind the main system window.

Also, column width did not occur well initially in list controls.
844afaf
@bjorng bjorng Fix calculation of fun size in erts_debug:size/1
Funs would be calculated using erts_debug:flat_size/1.
72d73ab
@psyeugenic Merge branch 'ph/fix-enfile/OTP-9990' into maint
* ph/fix-enfile/OTP-9990:
  Update preloaded prim_inet.beam
  gen_tcp: Use correct specs for accept and listen
  prim_inet: Catch system_limit in open_port
  Fix returned error from gen_tcp:accept/1,2 when running out of ports
68ba8d7
Commits on Mar 20, 2012
@bjorng bjorng Improve erts_debug_SUITE
Test erts_debug:size/1 too. Also test funs and shared terms.
c928e7e
@bjorng bjorng Merge branch 'bjorn/kernel/erts_debug_size-fix/OTP-9991' into maint
* bjorn/kernel/erts_debug_size-fix/OTP-9991:
  Improve erts_debug_SUITE
  Fix calculation of fun size in erts_debug:size/1
eb8c407
@pekadan pekadan Merge remote branch 'origin/peppe/common_test/otp-9880_9986_9989' int…
…o maint

* origin/peppe/common_test/otp-9880_9986_9989:
  Fix error with group config deleted before post_end_per_group
  Introduce new test suite for CTHs
  Fix bug in handling ct_hooks start arguments
  Use calls to ct_framework:init/end_per_suite for configuration
  Change ct_init/end_per_group to init/end_per_group
  Run hooks for non-existing config functions

OTP-9880
OTP-9986
OTP-9989
OTP-9992
f16576b
@RaimoNiskanen RaimoNiskanen erts: Remove unused ntbuild.erl 1247343
@garazdawi garazdawi Extend timeout for windows 07e52f5
@garazdawi garazdawi Fix memory leak when sendfile process crashes
We use the fact that file_flush is called when there is
data in the driver queue when a port is closed to ensure
that all data is cleaned up as it should.

OTP-9993
d883622
@garazdawi garazdawi Add test case for sending multiple small files on same connection c5dde79
@garazdawi garazdawi Fix ifdef to check if we are on OS X a9dac8d
@garazdawi garazdawi Fix bug when sending long files using select
The return value from efile_sendfile was not consistent
inbetween platforms. The API should now be working as it
was intended.

OTP-9994
3618672
@garazdawi garazdawi Fix reselecting bug on OS X
Since stop_select is called at an arbitrary point in the future
it would sometime not be alled before the tcp driver started
selecting on the fd. So now ERL_DRV_USE_NO_CALLBACK is used
so that the stop_select call is never made.

This seems to only have happened OS X.
2676ca6
@garazdawi garazdawi Merge branch 'lukas/kernel/sendfile_fixes' into maint
* lukas/kernel/sendfile_fixes:
  Fix reselecting bug on OS X
  Fix bug when sending long files using select
  Fix ifdef to check if we are on OS X
  Add test case for sending multiple small files on same connection
  Fix memory leak when sendfile process crashes
  Extend timeout for windows
  Skip sendfile suite if solaris 8
787ce33
@bmk bmk Merge branch 'bmk/snmp/snmp422_integration/r15' into maint d25cb37
Gustav Simonsson Merge branch 'ps/inet6-less-build-fix' into maint
* ps/inet6-less-build-fix:
  Add missing HAVE_IN6 && AF_INET6 ifdef

OTP-9996
28b0206
@sverker sverker Merge branch 'sverk/zlib_port_leak' into maint
* sverk/zlib_port_leak:
  Fix port leaks in zlib

OTP-9981
46dd06a
@sirihansen sirihansen [reltool] Update status bar for all config changes and for generate t…
…arget

OTP-9792

For some configuration changes and during generation of target system,
there was no indication in the status bar that reltool was
working. This has been corrected - it now says "Processing
libraries...".
e67e94c
Gustav Simonsson Merge branch 'dc/dch-fix-win32-escript' into maint
* dc/dch-fix-win32-escript:
  add escript win32 alternative invocation (thanks Pierre Rouleau)

OTP-9997
ee94b81
@sirihansen sirihansen [reltool] Improve title of dependency colum
OTP-9792

The colum listing modules that uses the current application or module
did earlier have the title "Modules used by others". This is now
changed to "Modules using this".
e855e83
Gustav Simonsson Bump version from 4.2.29 to 4.2.30 d7525be
Gustav Simonsson Merge branch 'gustav/ic/remove-warnings' into maint
* gustav/ic/remove-warnings:
  Bump version from 4.2.29 to 4.2.30
  Add generation of Erlang callback functions to avoid
  compiler warnings of generated Erlang source code
  Seq12023

  OTP-9998
75c1050
Hans Bolinder Make sure disk_log does not write too much data
While disk_log eagerly collects logged data for better performance,
collecting too much data may choke the system and cause huge binaries
to be written.

The problem was addressed in OTP-9764, but the situation was not
improved in all cases.

Thanks to Richard Carlsson.
51620fc
Hans Bolinder Correct a minor bug in qlc's testsuite 837047b
@sirihansen sirihansen Avoid undefined start_phases entry in .script
Inorder to align with reltool a {start_phases,undefined} entry in will
no longer occur in the application specification in .script files. The
start_phases entry will only exist if it contains real start phases.

Also, the default value for #application.start_phases is no longer set
to [] in systools.hrl. This value was actually never used, since it
was always explicitly set in systools_make:parse_applications - by
default to 'undefined', so the default value in the record definition
was only a confusing detail. Anyway - now corrected.
5e575f6
@sirihansen sirihansen Document correct default value for 'mod' parameter in .app
The default value for the 'mod' parameter in .app files was
incorrectly documented to be 'undefined'. It is now corrected to [].
973bc00
@garazdawi garazdawi Add the surefire ct hook
The hook should work with modern versions of Jenkins CI
to gather test results.
1190852
Torbjorn Tornkvist [eldap] Initial copy of Tobbe's eldap client
Copied with Torbjorns permission from https://github.com/etnt/eldap.git
d8dbf15
@sirihansen sirihansen Add documentation of regular expressions for version numbers in appup b773b65
@sirihansen sirihansen Fix error message if stdlib has faulty start type in .rel file
If stdlib had a different start type than permanent, systools_make
would fail but it would say that it was sasl that had faulty start
type. This has been corrected.
f4a9831
@sverker sverker Merge branch 'sverk/cpu-topology-crash' into maint
* sverk/cpu-topology-crash:
  erts: Fix memory corruption when reading topology info

OTP-10004
f224641
@dgud dgud [observer] Remove system from memory graph
It is confusing we have total and system is total - processes
6578815
@IngelaAndin IngelaAndin Removed function that should not be backmerged b82e76c
@IngelaAndin IngelaAndin Prepare for patch relese
Four digit version number as we backmerged part of R15 solutions
b438fd3
Commits on Mar 21, 2012
@lthor lthor Remove unused file 2bb66a9
@lthor lthor Merge branch 'lars/xmerl/remove-unused-file/OTP-9965' into maint
* lars/xmerl/remove-unused-file/OTP-9965:
  Remove unused file
a3fc8eb
@lthor lthor Fix continuation error 6793616
@lthor lthor Merge branch 'lars/xmerl/continuation-error/OTP-9961' into maint
* lars/xmerl/continuation-error/OTP-9961:
  Fix continuation error
d71f706
Hans Bolinder Merge branch 'hb/stdlib/fix_qlc_suite/OTP-10000' into maint
* hb/stdlib/fix_qlc_suite/OTP-10000:
  Correct a minor bug in qlc's testsuite
87b589c
Hans Bolinder Merge branch 'hb/kernel/too_greedy_disk_log/OTP-9999' into maint
* hb/kernel/too_greedy_disk_log/OTP-9999:
  Make sure disk_log does not write too much data
2fc45e2
@IngelaAndin IngelaAndin Prepare for release
Distribution fixes so no need to soft upgrade.
7ae61df
@dgud dgud [eldap] Add infrastructure f562e0f
@IngelaAndin IngelaAndin Prepare for release
Supervisor tree changed so can not do soft upgrade
3341f51
@RaimoNiskanen RaimoNiskanen erts: Implement erl_halt 5b74033
@RaimoNiskanen RaimoNiskanen erts: Remove forgotten and unused function erl_exit0 b9f0912
@RaimoNiskanen RaimoNiskanen erts: Make erlang:halt/0,1 close ports and flush async threads 3a10d2e
@RaimoNiskanen RaimoNiskanen stdlib: Stop working around erlang:halt not flushing 83d38d0
@dgud dgud Merge branch 'dgud/debugger/breakpoints_bug/OTP-9950' into maint
* dgud/debugger/breakpoints_bug/OTP-9950:
  [debugger] Fixed disappearing breakpoints
17aca0a
@dgud dgud Merge branch 'dgud/wx/misc-improvements/OTP-9947' into maint
* dgud/wx/misc-improvements/OTP-9947:
  [wx] Add more types
  [wx] Fix listctrl issues
  [wx] Fix bad defines
  [wx] Fix bad type references
  [wx] Fix missing export_types
d11efce
@dgud dgud Merge branch 'dgud/observer/fix-mem-graph' into maint
* dgud/observer/fix-mem-graph:
  [observer] Remove system from memory graph
6763de4
@IngelaAndin IngelaAndin Prepare for release
Updates for ssh that needs to restarted so no need for soft upgrade
ecf6c7e
@bufflig bufflig Correct build instruction for 32bit OpenSSL
	Also made some visual improvements to the example command lines
	for wxWidgets/OpenSSL and made some minor updates to the
	build instructions for those libraries.
0d530cb
@bufflig bufflig Merge branch 'pan/win_doc_fix/OTP-9846' into maint
* pan/win_doc_fix/OTP-9846:
  Correct build instruction for 32bit OpenSSL
134b978
@bufflig bufflig io_proto_SUITE: make sure temp files are removed 9327928
@bufflig bufflig Merge branch 'pan/remove_temp_files_io_proto_SUITE' into maint
* pan/remove_temp_files_io_proto_SUITE:
  io_proto_SUITE: make sure temp files are removed

OTP-10005
adcbf2f
@bufflig bufflig Teach big_boot_embedded testcase about comte a2171a3
@bufflig bufflig Teach edlin_expand_SUITE:init_per_suite independence d3c1354
@bufflig bufflig Teach ei testsuites parallel make 5acccdb
@bufflig bufflig Align java test Makefile.src with c tests ditto in ic b977401
@bufflig bufflig Merge branch 'pan/testcase-fix-bigboot' into maint
* pan/testcase-fix-bigboot:
  Align java test Makefile.src with c tests ditto in ic
  Teach ei testsuites parallel make
  Teach edlin_expand_SUITE:init_per_suite independence
  Teach big_boot_embedded testcase about comte

OTP-10008
f65b43b
@RaimoNiskanen RaimoNiskanen erts: Implement erlang:halt/2 b80ee2b
@RaimoNiskanen RaimoNiskanen erts: Document erlang:halt/2 and update erlang:halt/0,1 031773a
@RaimoNiskanen RaimoNiskanen erts: Basic test of erlang:halt/0..2 4cb0e5b
@bmk bmk Merge branch 'bmk/inets/inets59_integration2' into maint afe7a29
@pekadan pekadan Implement support for user controlled timetraps
OTP-9988
c2a3647
@pekadan pekadan Fix dialyzer reported errors 0748166
@garazdawi garazdawi Merge branch 'lukas/common_test/add_surefire_hook/OTP-9995' into maint
* lukas/common_test/add_surefire_hook/OTP-9995:
  Add the surefire ct hook
22d5fe1
@garazdawi garazdawi Disable built in hooks for emulator
This fixes a problem with node_container_SUITE:iter_max_procs/1
not working with redirect_log hook.
6fcadc9
@garazdawi garazdawi Change default of enable builtin hooks to undefined 1a8f98f
@dgud dgud [eldap] Remove broken functionality
eldap_fsm is broken so we have decided not support that at the moment.
Which makes eldap_sup and eldap_app unused and thus they are removed to.
a4cbcb1
@pekadan pekadan Update ct_master to use the Common Test CSS file for the logs
OTP-9973
3908431
@pekadan pekadan Repair is_release_available/1
OTP-9633
ef60b9f
@pekadan pekadan Document the create_priv_dir option for ct:run_test/1 c75d6ef
@sirihansen sirihansen Merge branch 'siri/reltool/fresh-up' into maint
OTP-9792
OTP-9794
OTP-9967
OTP-9968
OTP-9980
OTP-9984

* siri/reltool/fresh-up: (27 commits)
  [reltool] Improve title of dependency colum
  [reltool] Update status bar for all config changes and for generate target
  [reltool] Fix GUI problems on Windows
  [reltool] Remove skip statement for test that failed due to stdlib error
  [sasl] Sort applications used by other applications correctly in .script
  [sasl] Doc that included applications in .rel defaults to same as in .app
  [reltool] Fix problems with sorting of applications
  [reltool] Just warn if same module occurs twice in .app file
  [reltool] Always return warnings as flat strings
  [reltool] Fix type spec and doc for app() and mod()
  [reltool] Move tables out of common record
  [reltool] Display warnings continously in GUI
  [reltool] Cleanup test code
  [reltool] Unset ERL_FLAGS when running escript from reltool_server_SUITE
  [reltool] Improve error handling
  [reltool] Fix rollback and undo
  [reltool] Link together escript with inlined application
  [reltool] Fix badmatch when starting GUI
  [reltool] Update state and tables consistently for all types of config changes
  [reltool] Add test cases for handling of escripts
  ...
33e42a6
Commits on Mar 22, 2012
@sirihansen sirihansen [reltool] Add configuration parameter lib_dir on application level
As a way of specifying one specific version of an application, the
following configuration parameter is added on application level:

{lib_dir,Dir}, Dir = string()

This can be useful if the parent directory of the application
directory is not suitable to use as a lib dir on system level.
602d963
@IngelaAndin IngelaAndin Merge branch 'ia/ssl/prepare-for-release' into maint
* ia/ssl/prepare-for-release:
  Prepare for release
9bc49f7
@IngelaAndin IngelaAndin Merge branch 'ia/ssh/prepare-for-release' into maint
* ia/ssh/prepare-for-release:
  Prepare for release
69b111c
@IngelaAndin IngelaAndin Merge branch 'ia/public_key/prepare-for-release' into maint
* ia/public_key/prepare-for-release:
  Prepare for release
b2b96f8
Peter Lund [eldap] Add dereference options in search
And fix search reply when no object is found
a249c1f
@RaimoNiskanen RaimoNiskanen Merge branch 'raimo/close-ports-on-halt/OTP-9985' into maint
* raimo/close-ports-on-halt/OTP-9985:
  erts: Basic test of erlang:halt/0..2
  erts: Document erlang:halt/2 and update erlang:halt/0,1
  erts: Implement erlang:halt/2
  stdlib: Stop working around erlang:halt not flushing
  erts: Make erlang:halt/0,1 close ports and flush async threads
  erts: Remove forgotten and unused function erl_exit0
  erts: Implement erl_halt
  erts: Remove unused ntbuild.erl
1e13b92
@sirihansen sirihansen [reltool] Allow lib_dir on app level to use relative path
This commit adds a normalization of the directory given with the
lib_dir parameter on application level. This will covert the path to
absolute, remove trailing slash and any occurrencies of "xxx/..".
38f0683
@IngelaAndin IngelaAndin ssh:close/1 will no longer crash if ssl manager already happens to have
been terminated.

The function ssh_connection_manager:call now handles that exit
reason may be shutdown.
a06cd04
@slfritchie slfritchie Add DTrace support for OS X, Solaris, and Linux (via SystemTap), 1/4
Since it's been quite a while since I've written C code, *and* I
haven't done any significant hacking on the VM itself in years, it's
quite likely that I haven't done things in 100% proper style.  Or
my co-collaborators Dustin Sallings (CouchBase) or Michal Ptaszek
(Erlang Solutions).  My intent for this patch is to start discussion
and review of DTrace support for consideration for the R15 release.

For additional background on the motivation for this work, please
see the slides for the presentation at the Erlang User Conference 2011
in Stockholm:
  https://www.erlang-factory.com/upload/presentations/462/euc2011-draft2.pdf

Changes relative to dtrace-review2 branch:
    * Fix errors in OTP test suite 'kernel' file_SUITE
    * Fix errors in OTP test suite 'kernel' prim_file_SUITE
    * Fix bad pointer bug in efile_drv.c flush_write()
    * Move the DTrace material from the top of `README.md` into a
      new file, `README.dtrace.md`

Changes since last push to GitHub (relative to commit 5828a4f, which
was the former `dtrace-review1` branch):
    * Rebased onto 14 Nov 2011's "master" branch
    * Recent changes to the async task queuing mechanism means that
      the async worker queue length is not available.  A bogus value
      of -1 is hard-coded until there's a good way to peek into the
      new queue structure and find the queue length.
    * Small fixes based on review comments by Mikael Pettersson,
      Andrew Thompson, and Andreas Schultz.

Add autoconf support: use "./configure --enable-dtrace" on all supported
platforms:
    * OS X Snow Leopard or later
    * Solaris 10 or OpenSolaris
    * Linux, via SystemTap's DTrace compatibility packages
    * FreeBSD 9.0RC1.  FreeBSD 8 and earlier do not have support
      for USDT, DTrace's User-land Statically Defined Tracing.

See the file `erts/emulator/beam/erlang_dtrace.d` for the definition
of all DTrace probes in the virtual machine so far.

Example D scripts can be found in `lib/dtrace/examples`.  Note that if
you see the error message `{name of probe} does not match any probes`,
then there is no Erlang VM process + DTrace probes running.  To fix,
start a DTrace-enabled VM or remove `-q` from the `dtrace` command line.

The `lib/dtrace` directory contains a small code-only OTP application
that contains code that allows Erlang code to trigger a DTrace probe.
Dynamic creation & deletion of DTrace probes is not currently
supported, so the `dtrace:p()` function is hacked to allow a variable
number of arguments (up to four integers and up to four strings) to be
used.  See the comments at the top of `lib/dtrace/src/dtrace.c` for
more detail.

One feature that may be controversial is the notion I've introduced
of a special process dictionary key that can be used by Erlang code to
tag I/O operations for an application-specific purpose.  Right now,
that tag's name is `dtrace_utag`.  The dictionary keys used by `sys`
and other modules start with a dollar sign.  Perhaps there is some
convention (but not a dollar sign?) that this tag should use?

The purpose of the process dictionary key is to allow the tag to
be included in trace messages, e.g. for file I/O, without changing the
API of the `file.erl` module's functions.  For example, here's a use
of the tag when calling the `file:rename/2` function:

    (bar@sbb2)1> put(dtrace_utag, "GGOOOAAALL!!!!!").
    undefined

    (bar@sbb2)2> dtrace:init().
    ok

    %% Now start both the `user-probe.d` and `efile_drv.d` D scripts
    %% found in the `lib/dtrace/examples` directory.

    (bar@sbb2)3> dtrace:p(7, 8, 9, "one", "four").
    true

    %% The output from the `user-probe.d` script:
    <0.40.0> GGOOOAAALL!!!!! 7 8 9 0 'one' 'four' '' ''

    (bar@sbb2)4> file:rename("old-name", "new-name").
    {error,enoent}

    %% The output from the `efile_drv.d` script:
    async I/O pool port #Port<0.59> queue len 1
    async I/O pool port #Port<0.59> queue len 0
    efile_drv enter tag={1,110} user tag GGOOOAAALL!!!!! | RENAME (12) | args: old-name new-name , 0 0 (port #Port<0.59>)
    async I/O worker tag={1,110} | RENAME (12) | efile_drv-int_entry
    async I/O worker tag={1,110} | RENAME (12) | efile_drv-int_return
    efile_drv return tag={1,110} user tag GGOOOAAALL!!!!! | RENAME (12) | errno 2

I'm not exactly happy with this choice of tagging, namely using
`put(dtrace_utag, Tag::list())`.  But this is an experiment, so
we'll see how it goes.  I can't imagine changing the API for
all file.erl functions in order pass the tag explicitly.

Some modules have some extensive (ab)use of the C preprocessor to
reduce the amount of #ifdefs that clutter the code.  In several places,
I have not #ifdef'ed automatic variables because of clutter.  For the
same reason, there are a handful of cases where I added DTrace-related
members to a struct definition without an #ifdef.  I feel that the
result is easier to read than earlier drafts where I did use many more
`https://github.com/slfritchie/otp/tree/dtrace-experiment+michal2` if
you're curious.)  I expect there may be some debate about whether the
bloat of the affected structs is worthwhile.  I erred on adding stuff
to structs, especially in the efile_drv.c driver, not having a full
grasp on what was thread-safe and what was not ... so I erred on the
side of caution.

The efile_drv.c has a work-around for a crazy GCC optimization bug.
Thank goodness for Google, I dunno how I would've found a work-around
for this silly thing.  Many thanks to Trond Norbye for writing clearly
about the problem in a membase Git repo commit message.

/*
 * A note on probe naming: if "__" appears in a provider probe
 * definition, then two things happen during compilation:
 *
 *    1. The "__" will turn into a hypen, "-", for the probe name.
 *    2. The "__" will turn into a single underscore, "_", for the
 *       macro names and function definitions that the compiler and
 *       C developers will see.
 *
 * We'll try to use the following naming convention.  We're a bit
 * limited because, as a USDT probe, we can only specify the 4th part
 * of the probe name, e.g. erlang*:::mumble.  The 2nd part of the
 * probe name is always going to be "beam" or "beam.smp", and the 3rd
 * part of the probe name will always be the name of the function
 * that's calling the probe.
 *
 * So, all probes will be have names defined in this file using the
 * convention category__name or category__sub_category__name.  This
 * will translate to probe names of category-name or
 * category-sub_category-name.
 *
 * Each of "category", "sub_category", and "name" may have underscores
 * but may not have hyphens.
 */

Add tentative support for sequential tracing sending, queueing, and
receiving a message.  I don't believe I've fully covered all the major
places where it would be useful to have the sequential trace token info
in a probe -- guidance from the OTP team would be helpful, if there's
time to do that kind of review.

Add global variable `erts_this_node_sysname`.
0721ac4
@slfritchie slfritchie Add DTrace support for OS X, Solaris, and Linux (via SystemTap), 2/4
Add D scripts in the `lib/dtrace/examples` directory.

Add SystemTap README and sample scripts, contributed by
Andreas Schultz <as@travelping.com>.
0331c29
@slfritchie slfritchie Add DTrace support for OS X, Solaris, and Linux (via SystemTap), 3/4
Add probes to the virtual machine, except (mostly) the efile_drv.c
driver and other file I/O-related source files.
2f532f8
@slfritchie slfritchie Add DTrace support for OS X, Solaris, and Linux (via SystemTap), 4/4
Add probes to (mostly) the efile_drv.c driver and other
file I/O-related source files.
ad6387b
@psyeugenic Update dtrace for changes in R15 0fd4e39
@bufflig bufflig Add user tag spreading functionality to VM and use in file
User tags in a dynamic trace enabled VM are spread throughout the system
in the same way as seq_trace tokens. This is used by the file module
and various other modules to get hold of the tag from the user process
without changing the protocol.
c15f94e
@bufflig bufflig Change to more specific configure options for dtrace cca350e
@bufflig bufflig Correct some errors in the user tag spreading db4ddca
@bufflig bufflig Move dtrace erlang code and NIF into runtime_tools
Also make dyntrace NIF's load in on_load instead of init/0
0889c98
@bufflig bufflig Ifdef all dynamic trace code 326e098
@bjorng bjorng beam_makeops: Add a simple preprocessor c7f21d5
@bjorng bjorng If VM probes are not enabled, short-circuit calls to probe BIFs c79e110
@bufflig bufflig Rename dyntrace BIFs to more suiting names 560cea5
@bufflig bufflig Update README's for dtrace and systemtap 0c0d640
@bufflig bufflig Update slogan and add system_info for dynamic trace 19a36b9
@bufflig bufflig Add documentation for dyntrace and system_info changes 6969ae7
@bufflig bufflig Remove code causing dialyzer warning from prim_file ee14f5a
@bjorng bjorng erl_process.c: Fix probe for process exit 062b599
@bjorng bjorng Don't try to "clean up" generated fun names
The fun names may look ugly, but if we clean them up we can't
distinguish calls to the function defining the fun and to the
fun itself.
654983b
@bjorng bjorng Add probes for all kind of calls e3163d8
@bjorng bjorng Correct calculation of stack depth in call/return probes 848f6e5
@bjorng bjorng Use distinct function-entry probes for local and global calls
It seems useful to be able to filter out (for example) just
the global calls.
1e653c3
Gustav Simonsson Bump asn1 version number b5f6596
@bufflig bufflig Merge branch 'pan/dtrace' into maint
* pan/dtrace: (22 commits)
  Use distinct function-entry probes for local and global calls
  Correct calculation of stack depth in call/return probes
  Add probes for all kind of calls
  Don't try to "clean up" generated fun names
  erl_process.c: Fix probe for process exit
  Remove code causing dialyzer warning from prim_file
  Add documentation for dyntrace and system_info changes
  Update slogan and add system_info for dynamic trace
  Update README's for dtrace and systemtap
  Rename dyntrace BIFs to more suiting names
  If VM probes are not enabled, short-circuit calls to probe BIFs
  beam_makeops: Add a simple preprocessor
  Ifdef all dynamic trace code
  Move dtrace erlang code and NIF into runtime_tools
  Correct some errors in the user tag spreading
  Change to more specific configure options for dtrace
  Add user tag spreading functionality to VM and use in file
  Update dtrace for changes in R15
  Add DTrace support for OS X, Solaris, and Linux (via SystemTap), 4/4
  Add DTrace support for OS X, Solaris, and Linux (via SystemTap), 3/4
  ...

OTP-10017
5957a83
@pekadan pekadan Fix various problems with the user timetrap implementation 88c935d
Commits on Mar 23, 2012
@sirihansen sirihansen Merge branch 'siri/kernel/doc-mod-default-in-app/OTP-10002' into maint
* siri/kernel/doc-mod-default-in-app/OTP-10002:
  Document correct default value for 'mod' parameter in .app
8ee394f
@sirihansen sirihansen Merge branch 'siri/sasl/doc-regexp-in-appup/OTP-10001' into maint
* siri/sasl/doc-regexp-in-appup/OTP-10001:
  Add documentation of regular expressions for version numbers in appup
7b05df0
@sirihansen sirihansen Merge branch 'siri/sasl/correct-app-name-in-error/OTP-9888' into maint
* siri/sasl/correct-app-name-in-error/OTP-9888:
  Fix error message if stdlib has faulty start type in .rel file
95b0ebe
@sirihansen sirihansen Merge branch 'jc/omit-undefined-start_phases-3' into maint
* jc/omit-undefined-start_phases-3:
  Avoid undefined start_phases entry in .script
  Avoid creating an undefined start_phases entry when generating a release

OTP-10003
fd89175
@sirihansen sirihansen Merge branch 'siri/reltool/app-level-lib-dir/OTP-9977' into maint
* siri/reltool/app-level-lib-dir/OTP-9977:
  [reltool] Allow lib_dir on app level to use relative path
  [reltool] Add configuration parameter lib_dir on application level
b13b887
@pekadan pekadan Merge branch 'peppe/common_test/otp-9871' into peppe/common_test/otp-…
…9988_9871.merged

Conflicts:
	lib/common_test/src/ct_framework.erl
5fd1651
@garazdawi garazdawi Merge branch 'lukas/common_test/fix_disable_builtin_hooks_from_spec/O…
…TP-10009' into maint

* lukas/common_test/fix_disable_builtin_hooks_from_spec/OTP-10009:
  Change default of enable builtin hooks to undefined
  Disable built in hooks for emulator
158b774
Commits on Mar 26, 2012
@dgud dgud [eldap] Add asn.1 compilation options d351328
@IngelaAndin IngelaAndin Merge branch 'ia/ssh/shutdown-bug' into maint
* ia/ssh/shutdown-bug:
  ssh:close/1 will no longer crash if ssl manager already happens to have been terminated.
2c8eec6
@garazdawi garazdawi Rename fin_per_testcase to end_per_testcase edf598a
@garazdawi garazdawi Skip on buggy solaris 6cbcbdb
Anders Svensson vsn -> 1.1 baad363
Anders Svensson appup for OTP-9824 d6dbbe0
Anders Svensson Update include paths in example code
Paths changed as a consequence of OTP-9638. Don't use paths under src
however, assume an installation.
74ba63f
Anders Svensson Merge branch 'anders/diameter/release_R15B01' into maint
* anders/diameter/release_R15B01:
  Update include paths in example code
  appup for OTP-9824
  vsn -> 1.1
d99a085
@pekadan pekadan Merge remote branch 'origin/peppe/common_test/otp-10011' into maint
* origin/peppe/common_test/otp-10011:
  Document the create_priv_dir option for ct:run_test/1
2e39538
@pekadan pekadan Merge remote branch 'origin/peppe/common_test/otp-9633' into maint
* origin/peppe/common_test/otp-9633:
  Repair is_release_available/1
688386c
@pekadan pekadan Merge remote branch 'origin/peppe/common_test/otp-9973' into maint
* origin/peppe/common_test/otp-9973:
  Update ct_master to use the Common Test CSS file for the logs

OTP-9973
22c4c38
@pekadan pekadan Merge remote branch 'origin/peppe/common_test/otp-9988_9871.merged' i…
…nto maint

* origin/peppe/common_test/otp-9988_9871.merged:
  Fix various problems with the user timetrap implementation
  Fix dialyzer reported errors
  Implement support for user controlled timetraps

OTP-9988
67ccf96
@pekadan pekadan Increase test margin for user timetraps 0ec49ec
@bjorng bjorng runtime_tools: Add dyntrace_SUITE 49bd93a
Gustav Simonsson Merge branch 'as/ssl-tls-prf-function' into maint
* as/ssl-tls-prf-function:
  Some protocols (e.g. EAP-PEAP, EAP-TLS, EAP-TTLS)
  that use TLS as transport layer need to generate
  additional application specific key material
  One way to generate such material is to use the
  TLS PRF and key material from the TLS session itself

  OTP-10024
c1f3ffc
Gustav Simonsson Merge branch 'ud/fix-return-do_get_disc_copy2' into maint
* ud/fix-return-do_get_disc_copy2:
  Fixes value returned by mnesia_loader:do_get_disc_copy2/4

OTP-10015
OTP-10016
3e922e3
@pekadan pekadan Fix problem with wrong data_dir sent to hooks if init_per_* is missing c0d0515
@kostis kostis Add warnings_as_errors option a19f85f
@kostis kostis Up version 82ae6e4
@kostis kostis Use wx:wx_object() type now that it is exported e7b056e
@aronisstav aronisstav Report only actual unknown types otherwise no message is sent 154b98e
@aronisstav aronisstav Fix bug related with infinitely looping functions
Depending of the ordering of the functions during dataflow, a
function with an infinite loop might be identified as one that
always crashes. This is fixed now, by allowing restoration of
the infinitely-looping status.
982d670
Commits on Mar 27, 2012
Kenneth Lundin Correct handling of INTEGER (1..4 | 8 | 10 | 20) a24997a
Gustav Simonsson Merge branch 'sa/dialyzer-R15B01-last-minute-fixes' into maint
* sa/dialyzer-R15B01-last-minute-fixes:
  Fix bug related with infinitely looping functions
  Report only actual unknown types otherwise no message is sent
  Use wx:wx_object() type now that it is exported
  Up version
  Add warnings_as_errors option
83f2fac
@rickard-green rickard-green Fix wakeup functionality in no thread support case 12723bc
@garazdawi garazdawi Merge branch 'lukas/system/fix_ct_naming_convention' into maint
* lukas/system/fix_ct_naming_convention:
  Rename fin_per_testcase to end_per_testcase
ff53cc1
@dgud dgud [eldap] Add rudimentary docs c17aa8b
@IngelaAndin IngelaAndin Corrected dialyzer specs and exported some dialyzer specs 49acec1
@pekadan pekadan Merge remote branch 'origin/peppe/common_test/otp-10021' into maint
* origin/peppe/common_test/otp-10021:
  Increase test margin for user timetraps
efee6d3
@pekadan pekadan Merge remote branch 'origin/peppe/common_test/otp-10022' into maint
* origin/peppe/common_test/otp-10022:
  Fix problem with wrong data_dir sent to hooks if init_per_* is missing
effdfdc
Commits on Mar 28, 2012
@lthor lthor [xmerl] Fix error message and documentation bug 1462a9e
@dgud dgud [eldap] Fix parse_port error handling
Dialyzer found that.
1ff967c
@lthor lthor Merge branch 'lars/xmerl/sax-fixes/OTP-10026' into maint
* lars/xmerl/sax-fixes/OTP-10026:
  [xmerl] Fix error message and documentation bug
6ca1583
@lthor lthor [xmerl] Fix bug for comments in XSD files 464e7f0
@lthor lthor Merge branch 'lars/xmerl/xsd-comment-bug/OTP-10023' into maint
* lars/xmerl/xsd-comment-bug/OTP-10023:
  [xmerl] Fix bug for comments in XSD files
40db677
@IngelaAndin IngelaAndin Merge branch 'ia/ssl/dialyzer-specs' into maint
* ia/ssl/dialyzer-specs:
  Corrected dialyzer specs and exported some dialyzer specs
e93c9db
@bjorng bjorng INSTALL.md: Update information about MacOS X
* Bump version number of Lion.
* We no longer run tests on Tiger.
* Mark the information about building universal binaries as
  obsolete.
5d20526
@psyeugenic Merge branch 'lukas/system/skip_fenris_max_threads' into maint
* lukas/system/skip_fenris_max_threads:
  Skip on buggy solaris
1d1d445
Gustav Simonsson Moved test case to avoid a conflict between test cases.
This is a temporarily fix for R15B01.
0e47db5
@pekadan pekadan Update documentation
OTP-9972
OTP-9659
OTP-9855
OTP-9880
OTP-9973
OTP-9986
OTP-9992
OTP-9935
96b3f1c
@pekadan pekadan Merge branch 'peppe/common_test/otp-10029' into maint
* peppe/common_test/otp-10029:
  Update documentation

OTP-9972
ccc9e16
Commits on Mar 29, 2012
@dgud dgud Merge branch 'dgud/eldap' into maint
* dgud/eldap:
  [eldap] Fix parse_port error handling
  [eldap] Add rudimentary docs
  [eldap] Add asn.1 compilation options
  [eldap] Add dereference options in search
  [eldap] Remove broken functionality
  [eldap] Add infrastructure
  [eldap] Initial copy of Tobbe's eldap client

OTP-10034
472a3d9
@lthor lthor Fix descriptions of ssl_client_options and ssl_server_options d1c8d6d
@lthor lthor Merge branch 'lars/orber/ssl-opts-documentation/OTP-9966' into maint
* lars/orber/ssl-opts-documentation/OTP-9966:
  Fix descriptions of ssl_client_options and ssl_server_options
a0f6dad
@dgud dgud [wx] Fix list in list in list specs
To many lists
a7e1daf
@sirihansen sirihansen [reltool] Fix dialyzer warnings for R15B01
Records #mod{} and #app{} are used in ets:select and must therefore
have '$1', '$2' and '_' as possible value of fields.
4f277f9
@dgud dgud [eldap] Fix doc
Functions may not start with space, references do not work.
e1dda02
Kenneth Lundin replace 5 sec timeout (too short) with monitor in asn1_db requests
This bug was introduced as part of the parallelization of test suites and is notpart of any released version
f2802b9
Kenneth Lundin Merge branch 'kenneth/asn1/integer_range/OTP-9946' into maint
* kenneth/asn1/integer_range/OTP-9946:
  replace 5 sec timeout (too short) with monitor in asn1_db requests
  Correct handling of INTEGER (1..4 | 8 | 10 | 20)
6a3780b
Commits on Mar 30, 2012
@dgud dgud Merge branch 'dgud/wx/misc-improvements/OTP-9947' into maint
* dgud/wx/misc-improvements/OTP-9947:
  [wx] Fix list in list in list specs
dff1bdc
@dgud dgud [eldap] Fix docs
Fix copy paste errors
2580055
Gustav Simonsson Merge branch 'ta/docs-maint' into maint
* ta/docs-maint:
  Fix typos in ct getting_started_chapter.xml
  Fix typos in driver.xml and erl_driver.xml
  Fix typos in INSTALL-WIN32.md

  OTP-10037
4df37ce
@sirihansen sirihansen Merge branch 'siri/reltool/dialyzer/OTP-10035' into maint
* siri/reltool/dialyzer/OTP-10035:
  [reltool] Fix dialyzer warnings for R15B01
ac7d767
@sirihansen sirihansen [crashdump_viewer] Add case clause for testing with dump from R14B 8282516
@sirihansen sirihansen Merge branch 'siri/crashdump_viewer/create_r14b_dump/OTP-10032' into …
…maint

* siri/crashdump_viewer/create_r14b_dump/OTP-10032:
  [crashdump_viewer] Add case clause for testing with dump from R14B
f2ea927
Gustav Simonsson Merge branch 'gustav/sasl/release-handler-test-fix-temp' into maint
* gustav/sasl/release-handler-test-fix-temp:
  Moved test case to avoid a conflict between test cases.
  Temporarily fix for R15B01.
9fde164
@psyeugenic Update copyright years ce4431b
@psyeugenic Update primary bootstrap 523bb98
@sverker sverker erts: Fix memory leak caused by race on exiting process
Seen with valgrind running ets_SUITE:delete_large_tab
or delete_large_named_table.
73e6d0f
@rickard-green rickard-green Merge branch 'rickard/erts-poll/OTP-10019' into maint
* rickard/erts-poll/OTP-10019:
  Fix wakeup functionality in no thread support case

OTP-10036 is completely unrelated to this commit. Only here to trigger
info about the OTP-10036 ticket in the release notes script...

OTP-10036
7c052e0
@sverker sverker Merge branch 'sverk/proc-race-leak/OTP-10041' into maint
* sverk/proc-race-leak/OTP-10041:
  erts: Fix memory leak caused by race on exiting process
aa257fb
@pekadan pekadan Document the new timetrap interface
OTP-10039
d67b408
@pekadan pekadan Merge branch 'peppe/common_test/otp-10039' into maint
* peppe/common_test/otp-10039:
  Document the new timetrap interface
7148dea
Commits on Apr 01, 2012
Erlang/OTP Prepare release cfea5ee
Commits on Apr 03, 2012
@psyeugenic Update version numbers for R15B02 dev 5573888
Commits on Apr 04, 2012
@reedr reedr Increase ethr event and lock counting constants to allow at least +A …
…1024.
fbd0966
Commits on Apr 05, 2012
@reedr reedr erts: Add lcnt port and suspend options
* Add new suspend, location, and port_locks options to erts_debug:lock_counters.
* Init and destroy lock counting for processes and ports as appropriate.

Conflicts:

	erts/emulator/beam/erl_bif_info.c
daf8f46
Commits on Apr 10, 2012
@sverker sverker Add --no-commit option to update_primary and update_preloaded 71c3df2
@psyeugenic lcnt: Enhancement fixups 7693334
@reedr reedr lcnt: Let runq locks reflect actual call location efefd4b
Commits on Apr 11, 2012
Gustav Simonsson Merge branch 'ia/R14B04_ssl_send_user_badarg_patch' into maint-r14 aff21f5
@sverker sverker Merge branch 'sverk/otp_build-no-commit-opt' into maint
* sverk/otp_build-no-commit-opt:
  Add --no-commit option to update_primary and update_preloaded
59c5072
Gustav Simonsson Merge branch 'maint-r14' into maint-r15 fbf025a
Commits on Apr 12, 2012
@psyeugenic kernel: Initial doc of forgotten inet options
  * UDP: ulticast_if, multicast_loop and multicast_ttl,
    add_membership and drop_membership

  * Inet: bit8, buffer, deliver, high_watermark, linger and
    low_watermark
14867ef
@psyeugenic eldap: Update .gitignore cbe6549
@psyeugenic Update .gitignore 703d95b
Commits on Apr 13, 2012
Gustav Simonsson Merge branch 'maint-r15' into maint b94070e
@psyeugenic kernel: Document bit8 option in inet:setopts/2
  * This is a highly specialized option which is
    probably not used and will be removed in R16
5f8c0d0
@psyeugenic Merge branch 'rr/wa-lcnt/OTP-10051' into maint
* rr/wa-lcnt/OTP-10051:
  lcnt: Let runq locks reflect actual call location
  lcnt: Enhancement fixups
  erts: Add lcnt port and suspend options
  Increase ethr event and lock counting constants to allow at least +A 1024.
8614542
Commits on Apr 16, 2012
@psyeugenic kernel: Remove bit8 option in spec
  * The option is removed to force warnings for dialyzer
50feb40
@psyeugenic kernel: Document tcp-, udp- and sctp_module option d64479b
@psyeugenic kernel: Document ifaddr option
  * same as ip option
57c50be
@psyeugenic Merge branch 'egil/inet-document-options/OTP-10053' into maint
* egil/inet-document-options/OTP-10053:
  kernel: Document ifaddr option
  kernel: Document tcp-, udp- and sctp_module option
  kernel: Remove bit8 option in spec
  kernel: Document bit8 option in inet:setopts/2
  kernel: Initial doc of forgotten inet options
f1a49c4
Commits on Apr 17, 2012
@matthiasl matthiasl Extend erlang:port_info/1,2 to show the OS pid of a spawned process
When spawning OS (unix) processes with erlang:open_port, store the
resulting unix pid so that it can be queried later on using
erlang:port_info/1,2.
e2277e2
@psyeugenic Make port_info(Port,os_pid) work on Windows 3985e56
@bufflig bufflig Correct documentation, erl_bif_types and dialyzer tests ce019ae
@psyeugenic tests: Remove line macro from port_bif_SUITE d6d38a4
@bufflig bufflig Merge branch 'pg/r15/add-os-pid-to-port-info' into maint
* pg/r15/add-os-pid-to-port-info:
  tests: Remove line macro from port_bif_SUITE
  Correct documentation, erl_bif_types and dialyzer tests
  Make port_info(Port,os_pid) work on Windows
  Extend erlang:port_info/1,2 to show the OS pid of a spawned process

OTP-10057
b0534e7
@psyeugenic doc: Fix typo in inet 6435780
@psyeugenic doc: Add 'is' to explanation of callback modules 08403af
@psyeugenic Merge branch 'egil/inet-fix-doc-typos' into maint
* egil/inet-fix-doc-typos:
  doc: Add 'is' to explanation of callback modules
  doc: Fix typo in inet
a76628f