Merge branch 'master' into f22
Conflicts: .gitignore btrfs-progs.spec sources
This commit is contained in:
commit
8d6f324023
2
.gitignore
vendored
2
.gitignore
vendored
@ -14,8 +14,10 @@
|
||||
/btrfs-progs-v3.19.tar.xz
|
||||
/btrfs-progs-v3.19.1.tar.xz
|
||||
/btrfs-progs-v4.0.tar.xz
|
||||
/btrfs-progs-v4.0.1.tar.xz
|
||||
/btrfs-progs-v4.1.tar.xz
|
||||
/btrfs-progs-v4.1.2.tar.xz
|
||||
/btrfs-progs-v4.2.tar.xz
|
||||
/btrfs-progs-v4.2.1.tar.xz
|
||||
/btrfs-progs-v4.2.2.tar.xz
|
||||
/btrfs-progs-v4.3.1.tar.xz
|
||||
|
@ -1,5 +1,5 @@
|
||||
Name: btrfs-progs
|
||||
Version: 4.2.2
|
||||
Version: 4.3.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Userspace programs for btrfs
|
||||
|
||||
@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_libdir}/libbtrfs.so
|
||||
|
||||
%changelog
|
||||
* Wed Nov 18 2015 Eric Sandeen <sandeen@redhat.com> 4.3.1-1
|
||||
- New upstream release
|
||||
|
||||
* Wed Oct 08 2015 Eric Sandeen <sandeen@redhat.com> 4.2.2-1
|
||||
- New upstream release
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user