Commits on Feb 5, 2014
  1. @gustehn @IngelaAndin
  2. @gustehn @IngelaAndin

    [eldap, inets]: fix testcases when ssl not is present

    Conflicts:
    
    	lib/eldap/test/eldap_basic_SUITE.erl
    gustehn committed with IngelaAndin Nov 7, 2013
  3. @gustehn @IngelaAndin
  4. @gustehn @IngelaAndin
  5. @gustehn @IngelaAndin

    [inets, ssl]: make log_alert configurable as option in ssl, SSLLogLev…

    …el added as option to inets conf file
    
    Conflicts:
    
    	lib/inets/src/http_lib/http_transport.erl
    	lib/inets/src/inets_app/inets.appup.src
    	lib/ssl/src/ssl.appup.src
    gustehn committed with IngelaAndin Aug 15, 2013
  6. @gustehn @IngelaAndin
  7. @gustehn @IngelaAndin
  8. @gustehn @IngelaAndin
Commits on Nov 18, 2013
  1. @gustehn

    Merge branch 'maint'

    gustehn committed Nov 18, 2013
  2. @gustehn

    Merge branch 'metadave/dp_typo/OTP-11475' into maint

    * metadave/dp_typo/OTP-11475:
      fixed typo
    gustehn committed Nov 18, 2013
  3. @gustehn

    Merge branch 'maint'

    gustehn committed Nov 18, 2013
  4. @gustehn

    Merge branch 'fredrik/fix_tests_ssl_not_present/OTP-11474' into maint

    * fredrik/fix_tests_ssl_not_present/OTP-11474:
      [eldap, inets]: fix testcases when ssl not is present
    gustehn committed Nov 18, 2013
  5. @gustehn

    Merge branch 'maint'

    Conflicts:
    	bootstrap/lib/kernel/ebin/os.beam
    gustehn committed Nov 18, 2013
  6. @gustehn

    Merge branch 'mhssler/add-os-unsetenv/OTP-11446' into maint

    * mhssler/add-os-unsetenv/OTP-11446:
      erts: remove ?line macro in testcases
      Update primary bootstrap
      Add os:unsetenv/1
    gustehn committed Nov 18, 2013
Commits on Nov 15, 2013
  1. @gustehn

    Merge branch 'maint'

    gustehn committed Nov 15, 2013
  2. @gustehn

    Merge branch 'potatosalad/public_key_incorrect_emailaddress/OTP-11470…

    …' into maint
    
    * potatosalad/public_key_incorrect_emailaddress/OTP-11470:
      public_key_SUITE: Rename id-at-countryName to id-emailAddress
      public_key: Workaround for incorrectly encoded utf8 emailAddress
    gustehn committed Nov 15, 2013
Commits on Nov 14, 2013
  1. @gustehn

    Merge branch 'maint'

    gustehn committed Nov 14, 2013
  2. @gustehn

    Merge branch 'efine/pr/multicall-doc/OTP-11471' into maint

    * efine/pr/multicall-doc/OTP-11471:
      Fix rpc multicall sample code
    gustehn committed Nov 14, 2013
  3. @gustehn
Commits on Nov 13, 2013
  1. @gustehn

    Merge branch 'maint'

    gustehn committed Nov 13, 2013
  2. @gustehn

    Merge branch 'bsmr-erlang/fix_gen_fsm_example/OTP-11472' into maint

    * bsmr-erlang/fix_gen_fsm_example/OTP-11472:
      fixed small typo (missing right parenthesis) in gen_fsm example
    gustehn committed Nov 13, 2013
  3. @gustehn

    Merge branch 'maint'

    gustehn committed Nov 13, 2013
  4. @gustehn

    Merge branch 'fredrik/doc/syntax_highlight/OTP-11237' into maint

    * fredrik/doc/syntax_highlight/OTP-11237:
      erl_docgen: fix code highlighting and warning and note parts in erl_docgen
    gustehn committed Nov 13, 2013
  5. @gustehn
Commits on Nov 11, 2013
  1. @gustehn
  2. @gustehn

    Merge branch 'maint'

    gustehn committed Nov 11, 2013
  3. @gustehn

    Merge branch 'klyr/ssl_sni_client/OTP-11460' into maint

    * klyr/ssl_sni_client/OTP-11460:
      Update documentation
      Add a new server_name_indication option to ssl:connect
      Add SSL Server Name Indication (SNI) client support
    gustehn committed Nov 11, 2013
  4. @gustehn

    Update primary bootstrap

    gustehn committed Nov 11, 2013
Commits on Nov 8, 2013
  1. @gustehn

    Merge branch 'maint'

    gustehn committed Nov 8, 2013
  2. @gustehn

    Merge branch 'robertoaloi/eunit/surefire-printable-chars/OTP-11467' i…

    …nto maint
    
    * robertoaloi/eunit/surefire-printable-chars/OTP-11467:
      Do not attempt to detect lists of printable characters in Data
    gustehn committed Nov 8, 2013
Commits on Nov 7, 2013
  1. @gustehn

    Merge branch 'maint'

    gustehn committed Nov 7, 2013
  2. @gustehn

    Merge branch 'asterite/atan2_spec/OTP-11465' into maint

    * asterite/atan2_spec/OTP-11465:
      Spec for atan2 should be atan2(Y, X), not atan2(X, Y)
    gustehn committed Nov 7, 2013
  3. @gustehn

    Merge branch 'maint'

    gustehn committed Nov 7, 2013
  4. @gustehn

    Merge branch 'richcarl/sasl-dont-add-undefined-handler/OTP-11464' int…

    …o maint
    
    * richcarl/sasl-dont-add-undefined-handler/OTP-11464:
      Don't try to add the log_mf_h handler in sasl unless configured to do so.
    gustehn committed Nov 7, 2013
Commits on Nov 6, 2013
  1. @gustehn

    Merge branch 'maint'

    gustehn committed Nov 6, 2013