Commit Graph

421 Commits

Author SHA1 Message Date
Steven Armstrong b9b90dad36 merge from upstream
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-04-04 13:18:04 +02:00
Nico Schottelius 74e3447c40 add example multi branch .git/config
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-04 12:04:10 +02:00
Steven Armstrong fc10009946 update and merge ignore files
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-04-04 11:59:30 +02:00
Nico Schottelius 324fc13927 +changes
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-04 11:07:15 +02:00
Nico Schottelius 674e1f58f8 todo for 1.6
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-04 09:45:52 +02:00
Nico Schottelius 1310a1e42b ++todo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-02 14:40:31 +02:00
Nico Schottelius 252b511da7 done++
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-02 14:31:50 +02:00
Nico Schottelius 21aacd44b4 remove double information from reference
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-02 03:36:41 +02:00
Nico Schottelius 762fa52638 fixup cdist-reference: match only on .7 now, otherwise .html and .text is shown in manpage
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-02 03:30:35 +02:00
Nico Schottelius 44b11b9919 yum is funny
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-02 02:34:35 +02:00
Nico Schottelius 981df12e9a document changes
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-02 02:15:26 +02:00
Nico Schottelius bcfba18e6f more upcoming changes
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-02 01:22:09 +02:00
Nico Schottelius 1b87fc7c3f changes for 1.6.0
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-01 13:10:41 +02:00
Nico Schottelius 2c3d71a7e7 update todos
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-01 12:11:30 +02:00
Nico Schottelius 422bfd57d4 document multiple configuration workflow
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-01 11:30:55 +02:00
Nico Schottelius 8828a69d60 unignore doc/man and update cdist-best-practice.text
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-01 11:04:31 +02:00
Nico Schottelius 659bb1d1ac create reference in man7
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-01 10:47:09 +02:00
Nico Schottelius 1a0ef5ac63 update changelog
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-01 09:56:44 +02:00
Steven Armstrong 451e2b6fb4 merge master
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-31 22:51:55 +02:00
Nico Schottelius dbed2f1f83 1.5 not yet released, correct changelog
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 21:44:44 +02:00
Steven Armstrong c69feec5a0 -todo: conditional manpage building
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-31 20:49:02 +02:00
Nico Schottelius 7d0877d8ce ++cleanups
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 20:29:22 +02:00
Nico Schottelius 5359ed863c +cleanups++
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 20:21:08 +02:00
Nico Schottelius b3d7cf3192 more cleanups, __cdist prefixes
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 19:35:26 +02:00
Nico Schottelius 9955dc74c6 cleanups in bin/
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 18:43:08 +02:00
Nico Schottelius 7431802b03 ++todo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 15:43:07 +02:00
Steven Armstrong d85af22ce3 remove second author, asciidoc/docbook cant handle it
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 23:57:37 +02:00
Steven Armstrong d27afe3528 move manpages
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 17:24:40 +02:00
Nico Schottelius 022e255d7a less line breaks in asciidoc
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 16:55:40 +02:00
Nico Schottelius bcbabe885b authors on one line
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 16:54:11 +02:00
Nico Schottelius a891a951e7 cleanup todos
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 16:49:05 +02:00
Nico Schottelius 862ddd475a Merge remote-tracking branch 'sans/executionorder' 2011-03-29 16:47:43 +02:00
Steven Armstrong f64c7988de document __self
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 16:52:27 +02:00
Nico Schottelius 1d05756076 release 1.5.0
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 16:47:02 +02:00
Nico Schottelius 5024c4bf58 more changes, quote author correctly
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 16:45:16 +02:00
Nico Schottelius 5f1623dd1c Merge remote-tracking branch 'sans/executionorder' 2011-03-29 16:42:52 +02:00
Steven Armstrong bd4194cff9 Merge remote branch 'nico/executionorder' into executionorder 2011-03-29 16:40:40 +02:00
Nico Schottelius 8bd52b9065 Merge branch 'executionorder'
Conflicts:
	doc/dev/todo/TAKEME

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 16:37:39 +02:00
Steven Armstrong a5586aecff changelog++
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 16:36:10 +02:00
Nico Schottelius 0422eda599 WARNING: WHITESPACE-NAZI
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 16:33:09 +02:00
Nico Schottelius e2e4936103 -FIXME in doc/man/cdist-stages.text
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 16:24:13 +02:00
Nico Schottelius 44fd2e3c1c :%s/Related manpages/Related documentation/g
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 16:23:45 +02:00
Steven Armstrong 7c920231b7 update stages man page to reflect new situation
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 16:11:38 +02:00
Steven Armstrong 7ff2400830 remove legacy manpage
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 15:43:37 +02:00
Steven Armstrong 59cc3dc1b3 remove legacy manpage
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 15:42:40 +02:00
Steven Armstrong 49e987236f add manpage for cdist-object-manifest-run
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 15:42:17 +02:00
Steven Armstrong f671df1c67 less todo
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 15:33:37 +02:00
Steven Armstrong f187ed257a implement the big code shuffle
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 14:36:35 +02:00
Nico Schottelius 5306737d22 discuss todos / cleanup / make more fun for us
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 10:38:35 +02:00
Nico Schottelius bb66523ea5 todo: fix __ in asciidoc
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 22:43:50 +02:00