[X2Go-Commits] [x2goserver] branch x2goserver-xsettings updated (7c1101f -> d7f158f)

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch x2goserver-xsettings
in repository x2goserver.

      from  7c1101f   xsettings: filter out overriden keys. Add the rest to the second temporary file.
       new  3f9cc52   xsettings: use out file directly, no need for a second temp file.
       new  c0ee653   xsettings: rename XSETTINGSD_USER_CONF to XSETTINGSD_REMOTE_CONF.
       new  5ff6462   xsettings: add XSETTINGSD_OVERRIDES_CONF for the user-provided config overriding arbitrary settings and XSETTINGSD_CONF as the file eventually to be used by xsettingsd.
       new  6f40c24   xsettings: set XSETTINGSD_BASE_CONF to either the remote config to be pushed to the settings dir by a generic client or, if that is not available, the shipped global config in SYSCONFDIR.
       new  d7f158f   xsettings: use merge shell function to merge the determined base config with the overrides config.

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../post-start.d/900_xsettings-xsettingsd-startup  |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git