Commit graph

353 commits

Author SHA1 Message Date
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
c663d87ba6 release 3.0.5
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-05 22:53:45 +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
Nico Schottelius
65b3f6c75a also document require variable
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-05 20:52:35 +01:00
Nico Schottelius
d1cc8a6999 document environment variables that influence cdist
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-05 20:50:59 +01:00
Nico Schottelius
2363cdda47 ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-02-05 20:50:23 +01:00
Daniel Heule
1b455e810b clarify in the example that override don't touch parameter witch are not
present in the 2nd call
2014-02-02 20:29:41 +01:00
Nico Schottelius
ab3b151918 ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-31 21:52:43 +01:00
Nico Schottelius
dc1a5dfd6d update override documentation
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-31 21:50:32 +01:00
Nico Schottelius
99dedc4933 examples are always the last section
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-31 21:48:09 +01:00
Nico Schottelius
a9dd040164 Merge branch 'feature_object_override' of git://github.com/dheule/cdist 2014-01-31 21:47:23 +01:00
Daniel Heule
197fabf40a added some ideas from asteven and a bit more description about the order
in the manpage
2014-01-31 17:56:55 +01:00
Nico Schottelius
d5f04b26c8 ++changes(3.0.4)
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-29 23:19:18 +01:00
Nico Schottelius
aa3e92f07b use directory files/, not templates
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-29 21:08:22 +01:00
Nico Schottelius
e52a059adf ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-27 19:38:26 +01:00
Daniel Heule
4ef55ef13f allow object overrides with CDIST_ALLOW_OVERRIDE=true 2014-01-27 16:19:01 +01:00
Nico Schottelius
565e11b16d ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-27 14:18:56 +01:00
Nico Schottelius
78be159eb7 update reference: we also do not touch 'files' in the object
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-27 14:15:41 +01:00
Nico Schottelius
8216ec88e4 Merge branch 'master' into 4.0-pre-not-stable
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	docs/changelog
2014-01-24 01:20:12 +01:00
Nico Schottelius
a62e4aade3 ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-22 22:07:12 +01:00
Nico Schottelius
87d72dfc1a release: 3.0.3
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-22 00:46:35 +01:00
Nico Schottelius
0a3b5d33d9 Merge branch 'master' into 4.0-pre-not-stable 2014-01-22 00:45:12 +01:00
Nico Schottelius
0e49ccbf43 ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-22 00:44:56 +01:00
Nico Schottelius
cb648fce33 Merge branches 'install_integration' and 'preos' into 4.0-pre-not-stable 2014-01-21 17:17:29 +01:00
Nico Schottelius
26fcbbb4ef Merge branch 'master' into install_integration 2014-01-21 17:17:20 +01:00
Nico Schottelius
5f79efb201 Merge branch 'master' into preos 2014-01-21 16:46:22 +01:00
Nico Schottelius
520bcc29a7 ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-21 16:43:02 +01:00
Nico Schottelius
d89cdbae0a Merge branch 'master' into preos 2014-01-21 16:05:03 +01:00
Nico Schottelius
ba0c56efbd Merge branch 'master' into 4.0-pre-not-stable 2014-01-21 14:05:44 +01:00
Nico Schottelius
6746ba8279 ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-21 09:16:45 +01:00
Daniel Heule
64f4cff3cb Shell selection support via ENV
CDIST_LOCAL_SHELL for local scripts
CDIST_REMOTE_SHELL for remote scripts
2014-01-20 20:30:37 +01:00
Nico Schottelius
4bd6158260 add log from today
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 16:19:41 +01:00
Nico Schottelius
3ca911dbc6 integrate install and preos support
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:37:50 +01:00
Nico Schottelius
2388188fbb Merge branches 'preos' and 'install_integration' into 4.0-pre-not-stable 2014-01-20 14:28:49 +01:00
Nico Schottelius
7988b3f8b9 Merge branch 'master' into preos 2014-01-20 14:28:37 +01:00
Nico Schottelius
c16d542da4 Merge branch 'master' into install_integration 2014-01-20 14:28:29 +01:00
Nico Schottelius
f7c4437873 ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:27:26 +01:00
Nico Schottelius
c790014cd5 add scaled version of the cdist logo
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 10:11:23 +01:00
Nico Schottelius
e463f84333 add changelog for 4.x cdist series
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 10:04:42 +01:00
Nico Schottelius
f3bf1b3ea1 merge preos and install
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 09:47:45 +01:00
Nico Schottelius
f89a720cd2 Merge branch 'master' into preos 2014-01-20 08:48:44 +01:00
Nico Schottelius
ebc84859fc Merge branch 'master' into install_integration 2014-01-19 23:30:13 +01:00
Nico Schottelius
c47abb6af7 ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-19 23:29:56 +01:00
Nico Schottelius
bf7427e937 Merge branch 'master' into install_integration 2014-01-19 22:11:45 +01:00
Nico Schottelius
f3b7fc1514 release 3.0.2
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-19 21:38:38 +01:00
Nico Schottelius
f3ab45d9ff Merge branch 'master' into install_integration 2014-01-19 19:44:40 +01:00
Nico Schottelius
c4140a7c7b ++changes(3.0.2)
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-18 15:57:39 +01:00
Nico Schottelius
f23999c8d3 ++changes(3.0.2)
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-17 10:41:23 +01:00
Steven Armstrong
54815e2b29 implement cdist install
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-01-15 13:43:23 +01:00