]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
projects / thirdparty / asterisk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5333c27 d8972f5)
Merge changes from topic 'ASTERISK-26580' into 13
authorJoshua Colp <jcolp@digium.com>
Tue, 21 Feb 2017 22:34:56 +0000 (16:34 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 21 Feb 2017 22:34:56 +0000 (16:34 -0600)
* changes:
  res_config_ldap: Don't try to delete non-existent attributes
  res_config_ldap: Remove extraneous line numbers from log messages
  res_config_ldap: Make memory allocation more consistent
  res_config_ldap: Fix configuration inheritance from _general


Trivial merge
Mirror of https://github.com/asterisk/asterisk.git