otp.git/lib, branch bjorn/contributing Mirror of Erlang/OTP repository. Merge branch 'egil/erl_interface/fix-warning-in-erl_call/OTP-14086' into maint 2016-12-08T10:11:51+00:00 Björn-Egil Dahlberg egil@erlang.org 2016-12-08T10:11:51+00:00 b47d104994c6f11301f23b0675ed5f06f3e25922 * egil/erl_interface/fix-warning-in-erl_call/OTP-14086: erl_interface: Fix compile warning in erl_call 
* egil/erl_interface/fix-warning-in-erl_call/OTP-14086:
  erl_interface: Fix compile warning in erl_call
erl_interface: Fix compile warning in erl_call 2016-12-07T14:04:00+00:00 Björn-Egil Dahlberg egil@erlang.org 2016-12-07T14:04:00+00:00 e368a0f50336c144b821b1eb0b42a30292cb4630 






Update copyright-year
2016-12-07T12:15:31+00:00

Erlang/OTP
otp@erlang.org

2016-12-07T12:15:31+00:00

3eddb0f762de248d3230b38bc9d478bfbc8e7331












Merge branch 'hans/eldap/prepare_release' into maint
2016-12-06T11:10:59+00:00

Hans Nilsson
hans@erlang.org

2016-12-06T11:10:59+00:00

a0d365fc3c41464e77d24942aa3255788c5959a5

Eldap vsn.mk (version) was updated alhough it shouldn't.





Eldap vsn.mk (version) was updated alhough it shouldn't.







Revert "eldap: update vsn.mk"
2016-12-06T11:10:10+00:00

Hans Nilsson
hans@erlang.org

2016-12-06T11:10:10+00:00

21aaf7cd91a5b36481d693341b7ee6221ce83286

This reverts commit c9bf308b6e3e1a699d6262bbb5ec829fd7819513.





This reverts commit c9bf308b6e3e1a699d6262bbb5ec829fd7819513.







Merge branch 'siri/observer/more-port-info/ERL-272/OTP-13948' into maint
2016-12-06T10:59:37+00:00

Siri Hansen
siri@erlang.org

2016-12-06T10:59:37+00:00

86233038e1d49adb6387b810a7ba2487b15d6a02

* siri/observer/more-port-info/ERL-272/OTP-13948:
  [observer] Fix update of range in memory allocator graphs
  [observer] Add more port information
  [observer] Show monitored ports in process details view





* siri/observer/more-port-info/ERL-272/OTP-13948:
  [observer] Fix update of range in memory allocator graphs
  [observer] Add more port information
  [observer] Show monitored ports in process details view







Revert "[megaco] Update version" - only test suite updated
2016-12-06T09:59:09+00:00

Ingela Anderton Andin
ingela@erlang.org

2016-12-06T09:58:38+00:00

84c07543e260bfaa97f04625eee79a4a18fcaca2

This reverts commit ae8f00912587cbb8e9ace6660434e921bae9730b.





This reverts commit ae8f00912587cbb8e9ace6660434e921bae9730b.







Merge branch 'ingela/inets/httpd-profiles/OTP-14082' into maint
2016-12-06T08:06:24+00:00

Ingela Anderton Andin
ingela@erlang.org

2016-12-06T08:06:24+00:00

b54621a3ab17b0e2f6375b09c5854fc89c5cf412

* ingela/inets/httpd-profiles/OTP-14082:
  inets: Add Profile argument missed by commit fdfda2fab0921d409789174556582db28141448e





* ingela/inets/httpd-profiles/OTP-14082:
  inets: Add Profile argument missed by commit fdfda2fab0921d409789174556582db28141448e







Merge branch 'ingela/ssl/next-version' into maint
2016-12-06T08:05:56+00:00

Ingela Anderton Andin
ingela@erlang.org

2016-12-06T08:05:56+00:00

22e8ef1bb3597376f840cf337826bcc534501058

* ingela/ssl/next-version:
  ssl: Prepare for release





* ingela/ssl/next-version:
  ssl: Prepare for release







Merge branch 'ingela/dtls/statem/OTP-12982' into maint
2016-12-06T08:01:39+00:00

Ingela Anderton Andin
ingela@erlang.org

2016-12-06T08:01:39+00:00

b91e7498e625b4e6419238f753c30b509fb958d2

* ingela/dtls/statem/OTP-12982:
  ssl: Implement DTLS state machine





* ingela/dtls/statem/OTP-12982:
  ssl: Implement DTLS state machine