Merge remote-tracking branch 'origin/master' into f21

This commit is contained in:
Petr Lautrbach 2015-01-15 15:04:45 +01:00
commit 2bcb9f6f88
1 changed files with 2 additions and 2 deletions

View File

@ -64,7 +64,7 @@
# Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
%define openssh_ver 6.6.1p1
%define openssh_rel 11
%define openssh_rel 11.1
%define pam_ssh_agent_ver 0.9.3
%define pam_ssh_agent_rel 3
@ -751,7 +751,7 @@ getent passwd sshd >/dev/null || \
%endif
%changelog
* Fri Dec 19 2014 Jakub Jelen <jjelen@redhat.com> 6.6.1p1-11 + 0.9.3-3
* Thu Jan 15 2015 Jakub Jelen <jjelen@redhat.com> 6.6.1p1-11.1 + 0.9.3-3
- error message if scp when directory doesn't exist (#1142223)
- parsing configuration file values (#1130733)
- documentation in service and socket files for systemd (#1181593)