From d55770f91a6b6a0808ba3869da1e54f86e1ab3a2 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Tue, 21 Apr 2015 11:53:00 -0700
Subject: Update changelog with previously merged branches

---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index ff525337..c5ad7c60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,8 @@
  - Snappy: add support for installing snappy packages and configuring.
  - systemd: use network-online instead of network.target (LP: #1440180)
    [Steve Langasek]
+ - Add functionality to fixate the uid of a newly added user.
+ - Don't overwrite the hostname if the user has changed it after we set it.
 0.7.6:
  - open 0.7.6
  - Enable vendordata on CloudSigma datasource (LP: #1303986)
-- 
cgit v1.2.3