From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 28 Apr 2014 14:46:53 +0000 (+0100)
Subject: Merge branch 'dbus-1.8'
X-Git-Tag: dbus-1.9.0~50
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ebf75590e8af223308aa5b490737ce9e962bd49;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.8'

Conflicts:
	NEWS
---

6ebf75590e8af223308aa5b490737ce9e962bd49
diff --cc NEWS
index 507c5b24f,707f65333..326031a79
--- a/NEWS
+++ b/NEWS
@@@ -25,11 -7,14 +25,17 @@@ Enhancements
    Windows D-Bus binaries to be able to run tests under Wine
    (fd.o #41252, Ralf Habacker)
  
 +• on Unix platforms, disable Nagle's algorithm on TCP connections to improve
 +  initial latency (fd.o #75544, Matt Hoosier)
 +
+ • add Documentation key to dbus.service (fd.o #77447, Cameron Norman)
+ 
  Fixes:
  
+ • in "dbus-uuidgen --ensure", try to copy systemd's /etc/machine-id
+   to /var/lib/dbus/machine-id instead of generating an entirely new ID
+   (fd.o #77941, Simon McVittie)
+ 
  • on Windows, allow up to 8K connections to the dbus-daemon, instead of the
    previous 64 (fd.o #71297; Cristian Onet, Ralf Habacker)