Merge branch 'master' into f23

Conflicts:
	.gitignore
	btrfs-progs.spec
	sources
This commit is contained in:
Eric Sandeen 2015-11-18 11:20:55 -06:00
commit b1e0cab4ed
3 changed files with 6 additions and 2 deletions

1
.gitignore vendored
View File

@ -20,3 +20,4 @@
/btrfs-progs-v4.2.tar.xz /btrfs-progs-v4.2.tar.xz
/btrfs-progs-v4.2.1.tar.xz /btrfs-progs-v4.2.1.tar.xz
/btrfs-progs-v4.2.2.tar.xz /btrfs-progs-v4.2.2.tar.xz
/btrfs-progs-v4.3.1.tar.xz

View File

@ -1,5 +1,5 @@
Name: btrfs-progs Name: btrfs-progs
Version: 4.2.2 Version: 4.3.1
Release: 1%{?dist} Release: 1%{?dist}
Summary: Userspace programs for btrfs Summary: Userspace programs for btrfs
@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libbtrfs.so %{_libdir}/libbtrfs.so
%changelog %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 * Wed Oct 08 2015 Eric Sandeen <sandeen@redhat.com> 4.2.2-1
- New upstream release - New upstream release

View File

@ -1 +1 @@
7b1cfba5198622e5cd915f4ac12500c6 btrfs-progs-v4.2.2.tar.xz ae04b324a059482e4c7e9710043c4e93 btrfs-progs-v4.3.1.tar.xz