From: Ladislav Slezák <lslezak@suse.cz>
Date: Fri, 18 Dec 2015 09:12:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/SLE-12-SP1-GA' into rollback_only_root_master
X-Git-Tag: v0.3.3~26^2
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=eff8050ca220adccff4d76799255e458b5032140;p=thirdparty%2Fsnapper.git

Merge remote-tracking branch 'upstream/SLE-12-SP1-GA' into rollback_only_root_master
---

eff8050ca220adccff4d76799255e458b5032140
diff --cc VERSION
index 1866a362,639ede3c..13dead7e
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
- 0.2.9
 -0.2.9.1
++0.2.10
diff --cc package/snapper.changes
index 16bae799,d106960a..d0b8e1c4
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@@ -1,8 -1,8 +1,14 @@@
+ -------------------------------------------------------------------
+ Mon Dec 14 16:25:32 UTC 2015 - lslezak@suse.cz
+ 
+ - Allow rollback only for the root file system (bsc#954445)
 -- version 0.2.9.1
++- version 0.2.10
++
 +-------------------------------------------------------------------
 +Wed Oct 14 13:52:10 CEST 2015 - aschnell@suse.com
 +
 +- added conditional compilation of installation-helper
 +  (gh#openSUSE/snapper#202)
  
  -------------------------------------------------------------------
  Tue Sep 22 16:51:23 CEST 2015 - aschnell@suse.com