fancsali/cdist-backup
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
4312 commits 91 branches 177 tags 18 MiB
Commit graph

556 commits

Author SHA1 Message Date
Nico Schottelius
ff897bc904 Merge branch 'master' into 4.0-pre-not-stable 2014-02-14 20:58:19 +01:00
Nico Schottelius
44f910d199 Merge branch 'preos' into 4.0-pre-not-stable 2014-02-14 20:52:48 +01:00
Nico Schottelius
2734e5069e Merge branch '3.0' into 4.0-pre-not-stable 2014-02-14 20:52:36 +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
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
Nico Schottelius
a2c2cc139a adjust default branch hint 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-13 10:33:24 +01:00
Steven Armstrong
17472bc17b Merge remote-tracking branch 'telmich/preos' into preos 
Conflicts:
	cdist/preos.py
 2014-02-12 22:44:31 +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
Nico Schottelius
32eee3b8e9 Merge branch 'master' into 4.0-pre-not-stable 2014-02-12 16:47:10 +01:00
Nico Schottelius
23f85118f5 add a hint about unsupported os 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-12 16:42:02 +01:00
Daniel Heule
cfbc68aa11 bugfix if both override and order is specified 2014-02-12 10:31:46 +01:00
Nico Schottelius
4031209f7b Merge branch 'bugfix_issue_102' of git://github.com/dheule/cdist 2014-02-11 22:30:24 +01:00
Daniel Heule
6a5f908269 yep, dryrun option has now a unittest, was hard to work out ... 2014-02-11 21:17:19 +01:00
Nico Schottelius
dae43b4489 Merge branch 'feature_unittest_CDIST_ORDER_DEPENDENCY' of https://github.com/dheule/cdist 2014-02-11 15:31:56 +01:00
Nico Schottelius
1f39d50285 Merge branch 'feature_unittest_CDIST_ORDER_DEPENDENCY' of https://github.com/dheule/cdist into 4.0-pre-not-stable 2014-02-11 15:31:48 +01:00
Daniel Heule
e29255b9f2 add an unittest for CDIST_ORDER_DEPENDENCY 2014-02-11 15:20:26 +01:00
Nico Schottelius
97b2335323 Merge branch 'preos' into 4.0-pre-not-stable 2014-02-10 21:40:22 +01:00
Nico Schottelius
4efe8553da run apt-get clean before creating preos 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-10 21:40:11 +01:00
Nico Schottelius
3cc49460a3 Merge branch 'master' into preos 2014-02-10 21:34:54 +01:00
Nico Schottelius
42b240f496 Merge branch 'master' into 4.0-pre-not-stable 2014-02-10 14:56:19 +01:00
Daniel Heule
a5426ff4b5 completed copyright infos ... 2014-02-09 17:43:31 +01:00
Daniel Heule
2dd2f5593f bugfixes for issue 161 and FIXME: also check that there is no object ID 
when type is singleton?
 2014-02-09 17:10:43 +01:00
Daniel Heule
f3172fda95 2 more types for issue 131 2014-02-08 22:06:27 +01:00
Daniel Heule
423001b702 Make state parameter optional for all types, fixes #131 2014-02-08 21:48:51 +01:00
Nico Schottelius
03f99a0e55 Merge branch 'preos' into 4.0-pre-not-stable 2014-02-08 00:32:39 +01:00
Nico Schottelius
acddd14ce1 Merge branch 'master' into preos 2014-02-08 00:31:30 +01:00
Daniel Heule
60c53e213c testcases emulator.OverrideTestCase, with some minor bugfixes to make 
test work as expected ...
 2014-02-07 14:24:12 +01:00
Daniel Heule
f163b32720 first try of a test 2014-02-07 13:28:22 +01:00
Daniel Heule
717e21da6c initial update for override unittests 2014-02-07 00:28:02 +01:00
Nico Schottelius
1be3ea4362 Merge branch 'origin/feature_object_override' of git://github.com/dheule/cdist 2014-02-06 16:32:29 +01:00
Daniel Heule
52e2017d8f CDIST_ALLOW_OVERRIDE -> CDIST_OVERRIDE as requested by nico 2014-02-06 16:03:07 +01:00
Nico Schottelius
41266a1946 Merge branch 'feature__cdist_autodep_try2' of git://github.com/dheule/cdist 2014-02-06 15:48:45 +01:00
Daniel Heule
51afca5336 Implement lastest suggestions from nico, rename ENV Variable to 
CDIST_ORDER_DEPENDENCY
 2014-02-06 15:26:17 +01:00
Daniel Heule
2b5929c881 Merge branch 'master' of https://github.com/telmich/cdist into feature__cdist_autodep_try2 
Conflicts:
	docs/man/man7/cdist-manifest.text
 2014-02-06 15:10:34 +01:00
Nico Schottelius
4264237bfe Merge branch 'bugfix__types_default_values' of git://github.com/dheule/cdist 2014-02-06 11:26:35 +01:00
Nico Schottelius
294285c164 import __ccollect_source type 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-06 00:08:40 +01:00
Nico Schottelius
ee5731fc96 add __ccollect_source type 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-06 00:08:02 +01:00
Nico Schottelius
5389d71905 Merge branch 'master' into 4.0-pre-not-stable 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/config.py
	cdist/emulator.py
	docs/changelog
 2014-02-05 23:22:04 +01:00
Nico Schottelius
8afb752908 Merge branch 'issue/283' of git://github.com/asteven/cdist 2014-02-05 23:13:59 +01:00
Steven Armstrong
6f0459f3c5 remove legacy FIXME 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-02-05 21:18:47 +01:00
Steven Armstrong
7686a5ac5e be nice to them users 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-02-05 21:17:15 +01:00
Steven Armstrong
14a112fcce /wget/curl/ 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-02-05 21:12:22 +01:00
Nico Schottelius
34f2f7f038 setting up CDIST_ALLOW_OVERRIDE to any value is ok - do not depend on true/yes/ja 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-05 21:09:24 +01:00
Steven Armstrong
f928072f74 let the user decide what is sane and what not 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-02-05 21:07:33 +01:00
Steven Armstrong
03ce5a2828 import __apt_* types from private repo 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-02-04 12:24:10 +01:00
Daniel Heule
3c52710763 little changes for using default parameters correctly 2014-02-03 21:43:39 +01:00
Steven Armstrong
ca47ea0038 cleanup apt cache before packing initramfs 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-02-03 15:29:48 +01:00