[Merge] lp:~fjkong/ubuntu/vivid/ubuntu-settings/bug-1413865 into lp:ubuntu/ubuntu-settings

[F.J Kong]

F.J Kong has proposed merging lp:~fjkong/ubuntu/vivid/ubuntu-settings/bug-1413865 into lp:ubuntu/ubuntu-settings.

Requested reviews:
  Sebastien Bacher (seb128)

For more details, see:
https://code.launchpad.net/~fjkong/ubuntu/vivid/ubuntu-settings/bug-1413865/+merge/252343

=== modified file 'debian/changelog'
--- debian/changelog	2014-12-12 11:50:00 +0000
+++ debian/changelog	2015-03-09 17:47:00 +0000
@@ -1,3 +1,10 @@
+ubuntu-settings (15.04.1ubuntu1) vivid; urgency=medium
+
+  * debian/ubuntu-settings.gsettings-override:
+    - set critical-battery-action to 'shutdown' (lp: #1413865)
+
+ -- fjkong <fanjun.kong at canonical.com>  Tue, 10 Mar 2015 01:43:26 +0800
+
 ubuntu-settings (15.04.1) vivid; urgency=medium
 
   * Use proper casing for Unity8 schemas

=== modified file 'debian/ubuntu-settings.gsettings-override'
--- debian/ubuntu-settings.gsettings-override	2014-12-12 11:50:00 +0000
+++ debian/ubuntu-settings.gsettings-override	2015-03-09 17:43:16 +0000
@@ -94,7 +94,7 @@
 [org.gnome.settings-daemon.plugins.power]
 button-power = 'interactive'
 button-sleep = 'suspend'
-critical-battery-action = 'suspend'
+critical-battery-action = 'shutdown'
 
 [org.gnome.settings-daemon.plugins.xsettings]
 antialiasing = 'rgba'
-- 
Your team Ubuntu branches is subscribed to branch lp:ubuntu/ubuntu-settings.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 960 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20150309/5f1b5380/attachment.diff>