Commit graph

4632 commits

Author SHA1 Message Date
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
Nico Schottelius
d6b7033f2b ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-22 10:13:51 +01: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
9c6defe17c unauthenticated problem
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-18 20:17:08 +01:00
Nico Schottelius
4ce52c5a9d -ws
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-15 11:31:39 +01:00
Nico Schottelius
549a1fc754 Merge branch 'issue_286' of https://github.com/dheule/cdist 2014-02-14 22:19:07 +01:00
Daniel Heule
478ebd190c transfert idea into the file in git tree, so we can close issue 286 2014-02-14 22:06:43 +01:00
Nico Schottelius
0fdacac8ed Merge branch 'master' into type__rbenv 2014-02-14 21:25:18 +01:00
Nico Schottelius
ff897bc904 Merge branch 'master' into 4.0-pre-not-stable 2014-02-14 20:58:19 +01:00
Nico Schottelius
3a2bd673c9 enhance build scripts for releasing from non-master branch
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-14 20:58:12 +01:00
Nico Schottelius
ac23fa3e10 ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-14 20:53:43 +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
13e8e53941 Merge branch 'master' into type__rbenv 2014-02-14 20:51:29 +01:00
Nico Schottelius
1cdcb12ebd ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-14 20:51:20 +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
134a4a7b34 add discussion notes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-14 12:45:34 +01:00
Nico Schottelius
d55763ad6d ++release
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-14 09:59:56 +01:00
Nico Schottelius
a765fe5c07 ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-14 01:48:33 +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
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
2afa0ad2fc ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-12 17:07:07 +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
a4376b4d74 ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-12 16:57:29 +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
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
Daniel Heule
cfbc68aa11 bugfix if both override and order is specified 2014-02-12 10:31:46 +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