Merge branch 'master' into f22
This commit is contained in:
commit
7a7741e087
1
.gitignore
vendored
1
.gitignore
vendored
@ -315,3 +315,4 @@ network-manager-applet-0.8.1.tar.bz2
|
|||||||
/NetworkManager-1.0.3.tar.bz2
|
/NetworkManager-1.0.3.tar.bz2
|
||||||
/NetworkManager-1.0.3.git20160624.f245b49a.tar.bz2
|
/NetworkManager-1.0.3.git20160624.f245b49a.tar.bz2
|
||||||
/NetworkManager-1.0.3.git20150707.cf15f2a.tar.bz2
|
/NetworkManager-1.0.3.git20150707.cf15f2a.tar.bz2
|
||||||
|
/NetworkManager-1.0.3.git20150707.e3bd4e1.tar.bz2
|
||||||
|
@ -8,8 +8,8 @@
|
|||||||
%define ppp_version %(rpm -q ppp-devel >/dev/null && rpm -q --qf '%%{version}' ppp-devel || echo -n bad)
|
%define ppp_version %(rpm -q ppp-devel >/dev/null && rpm -q --qf '%%{version}' ppp-devel || echo -n bad)
|
||||||
|
|
||||||
%define snapshot .git20150707
|
%define snapshot .git20150707
|
||||||
%define release_version 0.2
|
%define release_version 0.3
|
||||||
%define git_sha cf15f2a
|
%define git_sha e3bd4e1
|
||||||
%define realversion 1.0.4
|
%define realversion 1.0.4
|
||||||
%define epoch_version 1
|
%define epoch_version 1
|
||||||
|
|
||||||
@ -683,6 +683,10 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jul 7 2015 Lubomir Rintel <lkundrak@v3.sk> - 1:1.0.4-0.3.git20150707.e3bd4e1
|
||||||
|
- A bit more recent Git snapshot
|
||||||
|
- This one fixes a regression with default route management
|
||||||
|
|
||||||
* Tue Jul 7 2015 Jiří Klimeš <jklimes@redhat.com> - 1:1.0.4-0.2.git20150707.cf15f2a
|
* Tue Jul 7 2015 Jiří Klimeš <jklimes@redhat.com> - 1:1.0.4-0.2.git20150707.cf15f2a
|
||||||
- Update to a new 1.0.3 development snapshot (git20150707)
|
- Update to a new 1.0.3 development snapshot (git20150707)
|
||||||
- core: fix handling of ignore-auto-* properties (rh #1239184)
|
- core: fix handling of ignore-auto-* properties (rh #1239184)
|
||||||
|
Loading…
Reference in New Issue
Block a user