Commit graph

4204 commits

Author SHA1 Message Date
Nico Schottelius
48923d23d8 if ... THEN ;-)
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-12-01 18:37:08 +01:00
Nico Schottelius
8998ea9298 ++changes(2.3.7)
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-11-29 16:02:17 +01:00
Nico Schottelius
bc9d40df37 ignore lock files
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-11-28 14:10:15 +01:00
Nico Schottelius
3b47a036e3 Merge branch 'preos' 2013-11-28 13:51:28 +01:00
Nico Schottelius
61dc7291dc ++changes(2.3.7)
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-11-27 16:28:06 +01:00
Nico Schottelius
f47d2c22bc Merge remote-tracking branch 'steven/issue/202'
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/conf/type/__link/explorer/type
2013-11-27 16:24:20 +01:00
Nico Schottelius
dfe4274467 Merge remote-tracking branch 'steven/issue/201'
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/conf/type/__directory/explorer/stat
	cdist/conf/type/__directory/explorer/type
2013-11-27 16:23:16 +01:00
Nico Schottelius
08dbf2e96c Merge remote-tracking branch 'steven/issue/198' 2013-11-27 16:22:14 +01:00
Steven Armstrong
abf291cb20 add gpl header
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-27 16:09:02 +01:00
Steven Armstrong
71b41df733 no late delete
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-27 16:09:02 +01:00
Steven Armstrong
6d5686229f only delete links; delete existing destination before creating links
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-27 16:09:02 +01:00
Steven Armstrong
f5a39e5281 add gpl header
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-27 16:08:50 +01:00
Steven Armstrong
7b065e931f rewrite type to work analog to __file and __link
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-27 16:08:50 +01:00
Steven Armstrong
d7984df503 make explorers executable
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-27 16:08:50 +01:00
Steven Armstrong
6c3b1e3ca0 add gpl header
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-27 16:05:10 +01:00
Nico Schottelius
de4db39f88 Merge remote-tracking branch 'steven/issue/201' 2013-11-27 15:15:03 +01:00
Nico Schottelius
965526a930 Merge remote-tracking branch 'steven/issue/202' 2013-11-27 15:14:10 +01:00
Nico Schottelius
dc27a15ec0 ++changes(2.3.7)
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-11-27 15:10:06 +01:00
Steven Armstrong
fcfd2d0a3c refactor so that there is no interaction between code-local and code-remote
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-26 16:31:18 +01:00
Steven Armstrong
a3dea70a97 Revert "first generate and execute *-local, then *-remote"
This reverts commit cf22499538266b1b4fac1694254edfd8ba9be68d.
2013-11-26 16:31:18 +01:00
Steven Armstrong
f82c4dc669 no late delete
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-26 16:31:17 +01:00
Steven Armstrong
5918de368d fix quoting, remove redundant code
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-26 16:31:17 +01:00
Steven Armstrong
12ef3ca4d2 first generate and execute *-local, then *-remote
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-26 16:31:17 +01:00
Steven Armstrong
db29ea8e70 intial take on fixing the file type
- upload file in a safer way
- remove destination if it is not a file
- only set attributes if required

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-11-26 16:31:17 +01:00
Nico Schottelius
2f842d56eb integrate messaging into gencode, manifest
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-11-26 01:17:37 +01:00
Nico Schottelius
edec2abb1d adopt first type: __file for messaging
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-11-26 01:01:44 +01:00
Nico Schottelius
ac5fa7cd64 integrate messaging into cdist
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-11-26 01:01:30 +01:00
Nico Schottelius
22a83d2c93 add new message object
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-11-26 00:27:08 +01:00
Nico Schottelius
ca1c5ff713 add another log for notifications
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-11-26 00:25:00 +01:00
Nico Schottelius
d1a569fecd remove bug comments -> no bug here
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-11-25 23:18:19 +01:00
Nico Schottelius
d00947711d Merge branch 'master' into notifications 2013-11-25 22:54:36 +01:00
Nico Schottelius
4302b7592d prepare next release
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-11-25 19:09:20 +01:00
Nico Schottelius
2932b8343f use printf instead of echo to avoid bash broken echo builtin
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-11-25 19:08:46 +01:00
Nico Schottelius
8a34b7dfea add final version of presentation + pdf variant
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-11-22 20:57:16 +01:00
Nico Schottelius
3759944a88 add presentation for eth (to be hold in a few minutes)
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-11-22 09:33:05 +01:00
Nico Schottelius
48f492c55e add old speech from ossawards
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-11-22 07:15:29 +01:00
Nico Schottelius
8c04316b65 add logfile
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-10-29 12:23:27 +01:00
Nico Schottelius
95513ab538 __line: handle fixed strings correctly, posix gave us -F -x for this case
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-10-29 12:23:07 +01:00
Steven Armstrong
9db28fab97 no late delete
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-10-15 14:55:35 +02:00
Nico Schottelius
990581a459 ++changes(2.3.6)
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-10-14 22:23:46 +09:00
Nico Schottelius
e7e610d829 add state parameter
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-10-14 22:05:29 +09:00
Nico Schottelius
465749f377 use localedef - locale-gen is a bad wrapper script
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-10-14 21:38:47 +09:00
Nico Schottelius
e0b009308a initial template for __locale
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-10-14 21:27:07 +09:00
Nico Schottelius
9ded11daf0 Merge branch 'type/__postfix' of git://github.com/asteven/cdist 2013-10-10 10:04:44 +09:00
Nico Schottelius
4cc3241dc2 Merge branch 'master' into 2.3 2013-10-10 09:59:15 +09:00
Nico Schottelius
c28aaab8ea Merge remote-tracking branch 'github/master' 2013-10-10 09:56:12 +09:00
Nico Schottelius
68ac5af63b ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-10-10 09:56:08 +09:00
Nico Schottelius
1c7f8baa02 Merge remote-tracking branch 'github/master' into 2.3 2013-10-10 09:55:55 +09:00
Nico Schottelius
8b7e1f16e9 Merge pull request #206 from asteven/issue/206
#200 broke tests
2013-10-09 17:54:29 -07:00
Nico Schottelius
3c49e93bfe +releasedate
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-10-10 09:53:24 +09:00