stephan/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity
4289 commits 109 branches 177 tags 19 MiB
Commit graph

4289 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nico Schottelius
32eee3b8e9 Merge branch 'master' into 4.0-pre-not-stable 2014-02-12 16:47:10 +01:00
Nico Schottelius
c615a82212 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-12 16:42:39 +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
Nico Schottelius
e3464bef1b release 3.0.8 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-11 22:46:25 +01:00
Nico Schottelius
9ce3809eb3 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-11 22:31:30 +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
6b53484277 Merge branch 'install_integration' into 4.0-pre-not-stable 2014-02-10 21:40:18 +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
219f3a99bf Merge branch 'master' into install_integration 2014-02-10 21:34:35 +01:00
Nico Schottelius
42b240f496 Merge branch 'master' into 4.0-pre-not-stable 2014-02-10 14:56:19 +01:00
Nico Schottelius
2b3aba1281 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-10 07:32:58 +01:00
Nico Schottelius
b4373b91b3 add document to describe the flow when installing 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-10 07:22:57 +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
Nico Schottelius
4cca593071 do not package .swp files (fixes #269) 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-08 00:44:47 +01:00
Nico Schottelius
ab94e37570 Merge branch 'install_integration' into 4.0-pre-not-stable 2014-02-08 00:32:42 +01:00
Nico Schottelius
03f99a0e55 Merge branch 'preos' into 4.0-pre-not-stable 2014-02-08 00:32:39 +01:00
Nico Schottelius
79973d1582 Merge branch 'master' into install_integration 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/config.py
	cdist/emulator.py
 2014-02-08 00:32:28 +01:00
Nico Schottelius
acddd14ce1 Merge branch 'master' into preos 2014-02-08 00:31:30 +01:00
Nico Schottelius
77df0ae324 update reference 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-08 00:14:42 +01:00
Nico Schottelius
f87fc63a79 cdist 3.0.7 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-08 00:13:33 +01:00
Nico Schottelius
689bf9f320 Merge branch 'feature_unittest_override' of git://github.com/dheule/cdist 2014-02-08 00:08:52 +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
2fa174f6ea update link to ungleich 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-06 17:02:14 +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
49764ae5c7 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-06 15:58:25 +01:00
Nico Schottelius
724385fcf3 update manifest document for in order execution 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-06 15:55:41 +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
98e7b7644c release 3.0.6 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-06 11:35:45 +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
c1d2ceefc2 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-06 00:10:02 +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
2e6a827513 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-05 23:15:56 +01:00
Nico Schottelius
8afb752908 Merge branch 'issue/283' of git://github.com/asteven/cdist 2014-02-05 23:13:59 +01:00
Nico Schottelius
c663d87ba6 release 3.0.5 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-05 22:53:45 +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