Commit graph

735 commits

Author SHA1 Message Date
Nico Schottelius
745f1e2984 support ubuntu upstart in __start_on_boot
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
2015-02-10 23:27:43 +01:00
Steven Armstrong
26143b8b77 move code generation outside of loop
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2015-02-10 22:44:08 +01:00
Steven Armstrong
7d73cc5ed6 actually use new --state param
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2015-02-10 22:44:08 +01:00
Steven Armstrong
d247f083e8 cleanup and rewrite
- add new --state parameter and support for deleting groups
- add new --system parameter to create system groups if supported by the
  os
- remove special case for legacy redhat/centos versions, they are long
  gone

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2015-02-10 22:44:08 +01:00
Nico Schottelius
0cf170b18e prettier print when requirements are broken
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
2015-02-10 21:59:39 +01:00
Nico Schottelius
f2b1c24ec3 Merge pull request #382 from acatton/fix-dir-in-default
Cdist fails silently when there's a directory in __type/parameter/default
2015-01-09 11:30:25 +01:00
Nico Schottelius
42c393ca40 add ubuntu support to __locale
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
2015-01-06 15:35:30 +01:00
Antoine Catton
2318c792d7 Fix test cdist_type.TypeTestCase.test_directory_in_default 2015-01-04 12:43:57 -07:00
Antoine Catton
9717d5d928 Add test case: what if there's a directory in defaults
The goal of the directory name is to be before foo and bar
2015-01-04 12:43:57 -07:00
Antoine Catton
a938468bb0 DRY: Remove default parameter value handeling in __package_rubygem 2014-12-27 20:48:42 -07:00
Antoine Catton
33cc3b0fa2 DRY: Remove default parameter value handeling in __package_pkg_openbsd 2014-12-27 20:47:30 -07:00
Antoine Catton
ebf0479f60 DRY: Remove default parameter value handeling in __package_pkgng_freebsd
flavor, repo and version are expected to be empty by default.
They're all checked with [ -n "$var" ]
2014-12-27 20:44:47 -07:00
Antoine Catton
f7bf6a058e DRY: Remove default parameter value handeling in __package_pkg_freebsd
flavor, pkgsite and version are expected to be empty.
They're all checked with [ -n "$var" ]
2014-12-27 20:42:03 -07:00
Antoine Catton
9fd285da4c DRY: Remove default parameter value handeling in __package_pip 2014-12-27 20:35:53 -07:00
Antoine Catton
5aaea37194 DRY: Remove default parameter value handeling in __package_pacman 2014-12-27 20:34:38 -07:00
Antoine Catton
65f50b64b7 DRY: Remove default parameter value handeling in __package_opkg 2014-12-27 20:32:49 -07:00
Antoine Catton
de282c50f3 DRY: Remove default parameter value handeling in __package_luarocks 2014-12-27 20:31:46 -07:00
Antoine Catton
601346d482 DRY: Remove default parameter value handeling in __package_apt 2014-12-27 20:29:45 -07:00
Antoine Catton
0844f717a8 Password is unused in the else branch 2014-12-27 20:26:29 -07:00
Antoine Catton
82f48ef271 DRY: Remove default parameter value handeling in __apt_source 2014-12-27 20:12:34 -07:00
Antoine Catton
17afb5f5ad DRY: Remove default parameter value handeling in __apt_source 2014-12-27 20:12:29 -07:00
Nico Schottelius
77b96b97c8 fix #343 - close fds of mkstemp for messages
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
2014-12-09 19:54:49 +01:00
Nico Schottelius
dd562befc9 add support for --target-release for __package_apt
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
2014-11-25 23:00:17 +01:00
Nico Schottelius
38d27d8769 Merge branch 'issue/372' of https://github.com/asteven/cdist 2014-10-23 16:27:52 +09:00
Nico Schottelius
4a0380ab65 Merge branch 'issue/369' of https://github.com/asteven/cdist 2014-10-23 16:27:29 +09:00
Steven Armstrong
28027f4261 dont fail just because grep in subshell exited non-zero
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-10-22 14:32:32 +02:00
Nico Schottelius
b724881c6a remove superfluous = from title to allow building when xsltproc is strict
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
2014-10-17 12:46:49 +09:00
Steven Armstrong
9f83622d38 remove legacy/unused explorer
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-10-07 16:36:01 +02:00
Ricardo Catalinas Jiménez
967652b5fe Make __package_{update_index,upgrade_all} quieter
And more non-interactive for the APT case.
2014-10-05 16:00:10 +01:00
Ricardo Catalinas Jiménez
5cfe569369 Make __package_apt even more non-interactive 2014-10-05 15:59:27 +01:00
Nico Schottelius
a6c37d688b Merge branch 'bugfix_type__package_emerge' of https://github.com/dheule/cdist 2014-10-02 15:20:08 +02:00
Ricardo Catalinas Jiménez
81bd4c3338 Add types __package_{update_index,upgrade_all} 2014-09-29 23:53:29 +01:00
Ricardo Catalinas Jiménez
ff880b4287 Fix comment 2014-09-29 22:37:50 +01:00
Ricardo Catalinas Jiménez
fd6b90a736 Cosmetic 2014-09-29 22:37:50 +01:00
Nico Schottelius
58ab351da3 Merge remote-tracking branch 'jake/__pkgng' 2014-09-29 21:18:31 +02:00
Nico Schottelius
7fab50a82b Merge remote-tracking branch 'steven/issue/365' 2014-09-29 20:48:45 +02:00
Daniel Heule
c70834eaff implemented some sugestions from nico 2014-09-29 17:28:45 +02:00
Steven Armstrong
41782cb107 workaround special case where the desired key was already present more then once in target file
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-09-29 14:47:25 +02:00
Nico Schottelius
8a56883d83 Merge branch 'osx-explorers' of https://github.com/mhutter/cdist 2014-09-29 11:14:33 +02:00
Steven Armstrong
4c52b10f93 maybe better define variable _before_ using it
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-09-29 10:57:27 +02:00
Steven Armstrong
4125dfaab0 them files should end in newline stupid
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-09-29 10:46:00 +02:00
Steven Armstrong
b17a1f0edb removing and adding keys must be atomic
If we delegate this to multiple seprarate objects (e.g. using __line) and the
config run is interrupted after applying only some of them we may leave the
target in some random state.
We may have even locked ourself out of the target.

So remove and add keys ourself so either none are all changes are
applied.

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-09-27 11:40:06 +02:00
Steven Armstrong
eed058426a fix that stupid stdin is truncated bug again
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-09-25 16:35:19 +02:00
Steven Armstrong
68586a0c3d new type to manage a single ssh authorized_key entry
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-09-25 16:23:38 +02:00
Steven Armstrong
ffd2935cc4 complete rewrite
- add support for authorized_keys options see sshd(8)
- add support for explicit comment after key
- do not allow a key to exist more then once in an authorized_keys file
- remove all conflicting keys

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-09-25 16:16:15 +02:00
Steven Armstrong
5a895480b7 Merge remote-tracking branch 'telmich/master' 2014-09-24 15:18:40 +02:00
Ricardo Catalinas Jiménez
60b2bbf4c9 Fix messaging variables not exported in type manifest 2014-09-21 11:52:38 +01:00
Jake Guffey
6eff4bb898 Implemented telmich's suggestions
Using $($__explorer/os), command -v directly
Fix spacing
Fix copyright year
2014-09-17 17:43:29 -04:00
Ricardo Catalinas Jiménez
3223a38889 Fix typo in cdistmarker doc 2014-09-13 23:31:38 +01:00
Jake Guffey
37a8b4af2b Minor fixes
Fixed pkgng_exists explorer (can't reference $__global)
Fixed logic in __package/pkgng_freebsd/gencode-remote
   Wasn't installing package if it already exists, but after explorer execution
2014-09-10 15:54:13 -04:00
Jake Guffey
e87b26f2de Introduce __package_pkgng_freebsd type
Create __package_pkgng_freebsd type to handle package management via pkg-ng
Add requirement generation in __package/manifest
Add explorer inside __package to find if pkg-ng is installed on the target
2014-09-09 17:10:32 -04:00
Steven Armstrong
a956583169 Merge remote-tracking branch 'telmich/master' 2014-08-20 13:03:35 +02:00
Nico Schottelius
249455f347 also support archlinux in __locale
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-08-17 12:03:46 +02:00
Steven Armstrong
3dbe375837 no need to double escape a trailing $; $ by itself is not special in any way
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-07-28 15:05:45 +02:00
Steven Armstrong
fff5e48266 /index/match/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-07-28 15:04:48 +02:00
Nico Schottelius
c6ad2e60b3 remove obsolete todos ... people believe they still need to be fixed!
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-06-26 17:11:35 +02:00
Nico Schottelius
37451590b1 add reset to iptables init.d script
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-06-26 15:24:42 +02:00
Daniel Heule
614c73e10e correct date of c 2014-06-25 00:18:41 +02:00
Daniel Heule
ab6502c9df correct match if / is the last char of a url and the end of the line 2014-06-25 00:16:40 +02:00
Manuel Hutter
981f8068d2 code diet on "memory" 2014-06-21 14:24:10 +02:00
Manuel Hutter
e727824964 cat and pipe diet 2014-06-18 10:19:21 +02:00
Manuel Hutter
c36fba4b99 Fixed global explorers on OSX 2014-06-17 19:04:22 +02:00
Nico Schottelius
d294a2c28e +"
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-06-16 08:02:41 +02:00
Nico Schottelius
6a2f2352be new type: __ssh_dot_ssh
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-06-16 07:57:10 +02:00
Nico Schottelius
efb2c4a163 Merge branch 'fix-file-stat-osx' of https://github.com/mhutter/cdist 2014-06-11 00:35:01 +02:00
Nico Schottelius
3592a0c6dd +suse support in __locale and __hostname
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-06-10 23:50:53 +02:00
Nico Schottelius
17504975a6 suse support for __timezone
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-06-10 23:15:21 +02:00
Manuel Hutter
8a70343e2c Fixed wrong mode format for stat on OSX. 2014-06-10 19:48:02 +02:00
Manuel Hutter
90acfc3952 Fixed stat on OSX 2014-06-10 19:19:26 +02:00
Daniel Heule
9bac6da6c9 bugfix emerge type for slotted packages 2014-06-09 15:42:17 +02:00
Nico Schottelius
bbd451433f add --url support for __package_yum
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-05-20 07:43:11 +02:00
Nico Schottelius
c363fc24de begin to make OBJECT_MARKER dynamic
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-05-06 00:28:18 +02:00
Nico Schottelius
ae53b8e381 Merge branch 'bugfix__zypper' of https://github.com/dheule/cdist 2014-05-05 22:32:54 +02:00
Nico Schottelius
47ba46400c Merge pull request #325 from jdguffey/__jail_messaging
Added messaging support for __jail type
2014-05-04 08:52:48 +02:00
Nico Schottelius
1bb897f9a2 Merge pull request #312 from asteven/issue/312
all files cdist creates should allways end with newline
2014-05-04 08:50:30 +02:00
Nico Schottelius
1bfa281cec Merge pull request #334 from dheule/bugfix__explorer_interfaces
bugfix the list of interfaces
2014-05-04 08:43:12 +02:00
Nico Schottelius
bfbc621010 ++releasedate
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-04-29 18:10:50 +02:00
Daniel Heule
3710557c62 bugfix the list of interfaces 2014-04-29 12:57:46 +02:00
Daniel Heule
5a647ec763 Bugfix to auto import pgp keys for new repos, so we can add repos with new keys 2014-04-29 11:49:43 +02:00
Nico Schottelius
9127e06109 CentOS support for __hostname
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-04-25 01:48:58 +02:00
Steven Armstrong
8a4cc56266 ensure all files we create end with a single newline
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-04-22 11:04:02 +02:00
Nico Schottelius
f9783f5f77 Merge branch 'bugfix_issue_327' of https://github.com/dheule/cdist 2014-04-15 01:27:50 +02:00
Daniel Heule
c5152b75f2 rename parameter service_uri to uri as requested 2014-04-14 19:18:16 +02:00
Daniel Heule
831acd16c6 rename parameter repo_uri to uri as requested by nico 2014-04-14 19:14:29 +02:00
Steven Armstrong
40e517f50c new type __yum_repo to manage yum repositories
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-04-14 12:46:17 +02:00
Jake Guffey
f7a6377b74 Updated man page
Included MESSAGES section
2014-04-07 09:44:28 -04:00
Jake Guffey
d12daf10c4 Added messaging support for __jail type
prints start/stop/create/delete/onboot to $__messages_out
2014-04-07 09:41:03 -04:00
Nico Schottelius
9eec4e22fb Merge branch 'bugfix_type__key_value' of https://github.com/dheule/cdist 2014-04-06 20:22:23 +02:00
Nico Schottelius
ad7977e51b ++;;
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-03-31 23:58:58 +02:00
Nico Schottelius
2955ef4344 cleanups
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-03-31 21:22:29 +02:00
Nico Schottelius
b7f8b5e339 catch unsupported state cases in __dog_vdi und __qemu_img
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-03-31 21:22:15 +02:00
Nico Schottelius
b22b581b67 first version of __dog_vdi
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-03-31 14:26:14 +02:00
Nico Schottelius
ff8f7ac287 add copied version __dog_vdi from __qemu_img
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-03-30 13:09:38 +02:00
Daniel Heule
50316902e3 renamed ll to lastline, hope its now clear what the var is for .. 2014-03-26 13:58:29 +01:00
Nico Schottelius
f3c3f454d3 Merge branch 'feature_new_explorers' of https://github.com/dheule/cdist 2014-03-26 13:06:33 +01:00
Daniel Heule
7b6102750e as requested, replace space with _ 2014-03-26 11:57:15 +01:00
Nico Schottelius
2c6e3e0e96 Merge branch 'jailfix' of https://github.com/jdguffey/cdist 2014-03-26 11:19:09 +01:00
Nico Schottelius
73b54aab09 Merge branch 'issue/321' of https://github.com/asteven/cdist 2014-03-26 11:15:36 +01:00
Nico Schottelius
58d57bc532 Merge branch 'enhancement-package-pkg-openbsd' of https://github.com/ghettosh/cdist 2014-03-26 11:06:22 +01:00
Nico Schottelius
6e81bbc54b Merge branch 'issue/315' of https://github.com/asteven/cdist 2014-03-26 10:59:50 +01:00
Daniel Heule
bae472eb33 fixed some typos in the man page 2014-03-26 10:41:00 +01:00
Jake Guffey
c31278bcd0 Fix __jail explorers
Only fixed gencode*, manifest in PR #279, fixed explorers here
2014-03-25 12:50:27 -04:00
Daniel Heule
b7fb973fa5 bugfix for whitespace stripping, its no more simple 2014-03-21 09:35:47 +01:00
Daniel Heule
807e2902ea Merge branch 'master' of https://github.com/telmich/cdist into bugfix_type__key_value
New functionality for remote __object is needed
2014-03-21 09:23:44 +01:00
Daniel Heule
f36dc11601 forgot myself to the headers .. 2014-03-20 17:22:07 +01:00
Daniel Heule
5ef27191fc implementing the $__object and $__object_id on the local and remote
execution call, to allow read access to parameter files
2014-03-20 13:52:12 +01:00
Nico Schottelius
2b03ccd776 changes for 3.1.0
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-03-19 18:57:11 +01:00
Nico Schottelius
bcca8a637b Merge branch 'master' into type__rbenv 2014-03-13 10:30:48 +01:00
Daniel Heule
619076bd2d corrected a small relict in example 2014-03-12 20:16:33 +01:00
Daniel Heule
a94de8fae4 Merge branch 'master' of https://github.com/telmich/cdist into bugfix_type__key_value
Conflicts:
	cdist/conf/type/__key_value/gencode-remote
2014-03-12 20:07:27 +01:00
Steven Armstrong
5ec617fa3e ignore trailing slashes for comparison of source
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-03-11 22:16:08 +01:00
Steven Armstrong
301b4e18ff either to it all, or fail; echo and cat suck, printf ftw!
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-03-11 21:07:20 +01:00
Daniel Heule
38c3d551ba bugfix, if file was absent and type is now tested on openwrt 2014-03-11 21:05:31 +01:00
Steven Armstrong
75c203a1f0 handle existing symlink but wrong source
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-03-11 20:48:47 +01:00
Nico Schottelius
0a98abbffa add messaging support for __key_value
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-03-11 15:39:08 +01:00
og
3d5706d3cc escaped some variables in the gencode-remote output 2014-03-08 17:18:19 -07:00
og
074938c697 . 2014-03-03 15:13:57 -07:00
og
3fffb93150 OpenBSD pkg utils does not return properly, so we have to verify success by looking at the list of installed packages after the present/absent actions 2014-03-03 14:59:50 -07:00
Nico Schottelius
f06ff4bc3a Merge branch 'master' of https://github.com/ghettosh/cdist 2014-03-03 07:40:54 +01:00
og
ef1f9bf633 updated documentation to reflect new parameter 2014-03-02 17:44:22 -07:00
og
6a455be63a openbsd and freebsd both use the 'passwd' database 2014-03-02 17:34:36 -07:00
og
5cbdf981c0 adding pkg_path parameter to be explicitly set, this is important for using -current, as os_version always parses to a release version (e.g. 5.5) but the path that mirrors have is /snapshots/ 2014-03-02 17:32:14 -07:00
og
1c0d74f7db openbsd stat works the same way that freebsd's does 2014-03-02 17:18:25 -07:00
Daniel Heule
fa55cd7d3b ups, typo ... thx to steven 2014-02-27 21:08:45 +01:00
Daniel Heule
727c918f67 work around a bug in bash3, now tested with dash, bash, busybox 2014-02-27 17:04:23 +01:00
Daniel Heule
0198b99eb5 corrected some debug codesnips 2014-02-27 15:47:19 +01:00
Daniel Heule
8d80e52de9 implemented some suggestions from steven 2014-02-27 14:45:19 +01:00
Daniel Heule
d1c55a9acb Merge branch 'master' of https://github.com/telmich/cdist into bugfix_type__key_value 2014-02-25 11:41:18 +01:00
Daniel Heule
225752bd42 updated the man page .... 2014-02-25 11:35:14 +01:00
Nico Schottelius
8e68da055c Merge branch 'docfix-ssh-22' of https://github.com/acatton/cdist 2014-02-25 09:51:43 +01:00
Daniel Heule
820ed5ae0c added option comment_line to prefix key value with a comment line 2014-02-24 23:27:42 +01:00
Daniel Heule
205e256ef6 rewrite of __key_value, now support nerarly every value 2014-02-24 21:42:45 +01:00
Nico Schottelius
a126bd955f use while read -> avoids ifs problem
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-24 18:06:15 +01:00
Nico Schottelius
ce0f779664 include the owner into the object_id for line
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-24 16:00:12 +01:00
Antoine Catton
4e535b6b8b Docfix: ssh service listen on port 22 2014-02-23 20:22:06 -07:00
Steven Armstrong
95f38d9d44 remove no longer supported parameter --comment
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-22 01:12:41 +01:00
Steven Armstrong
16a829d3eb manage individual keys instead of block of text
also fixes #251

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-22 01:10:44 +01:00
Steven Armstrong
2fdff153d6 dont fail if result is empty file
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-22 00:57:00 +01:00
Steven Armstrong
68c1bf6633 preserve ownership and permissions of existing file
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-22 00:56:54 +01:00
Nico Schottelius
13e8e53941 Merge branch 'master' into type__rbenv 2014-02-14 20:51:29 +01:00
Nico Schottelius
f461a5073c pass owner/group/mode to __directory as well
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-14 20:44:51 +01:00
Nico Schottelius
95b1ac0706 update rbenv type to cdist 3.0 style
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-14 20:34:24 +01:00
Nico Schottelius
490bad7b26 Merge branch 'master' into type__rbenv 2014-02-14 20:13:18 +01:00
Nico Schottelius
ab8ae75837 Merge branch 'issue/297' of git://github.com/asteven/cdist 2014-02-14 01:48:03 +01:00
Steven Armstrong
f82a6224f2 use positional arguments in favour of keyword arguments for backwards compatibility with older python
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-13 21:05:37 +01:00
Steven Armstrong
46459053f4 use posix -L in favour of longopts
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-02-13 21:02:18 +01:00
Daniel Heule
e8f5d4c340 some new explorers wich are handy if you must tune for example sap or
oracle to the systemtype, cpu cores and/or physical memory
2014-02-13 15:38:35 +01:00
Nico Schottelius
a2c2cc139a adjust default branch hint
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-13 10:33:24 +01:00
Nico Schottelius
2ceced593b Merge branch 'bugfix_state_params' of git://github.com/dheule/cdist 2014-02-12 17:04:30 +01:00
Nico Schottelius
01a3f7c0b7 Merge branch 'bugfix_override_and_order' of https://github.com/dheule/cdist 2014-02-12 16:56:30 +01:00