contradict
/
cdist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,196 Commits 106 Branches 177 Tags 18 MiB
Commit Graph

1018 Commits

Author SHA1 Message Date
Nico Schottelius e7fa238b2a Fix mkfs.vfat support (no -q) 2017-06-16 05:30:40 +02:00
Darko Poljak e32f2110ab Document object prepare and object run parallelization. 2017-06-13 22:54:40 +02:00
Darko Poljak 8cd2136d8e Release 4.4.3 2017-06-13 18:07:11 +02:00
Darko Poljak 0ec361165d Update changelog. 2017-06-11 14:02:47 +02:00
Darko Poljak d4ec3a709d Update cdist man page copyright. 2017-06-11 14:01:16 +02:00
Darko Poljak d6ca077959 Fix cdist man page text. 2017-06-11 13:58:47 +02:00
Nico Schottelius 3a7013d7a1 Merge branch 'master' of github.com:telmich/cdist 2017-06-03 18:16:25 +02:00
Nico Schottelius 91ff80fa6a Add devuan support for __start_on_boot 2017-06-03 18:15:44 +02:00
Darko Poljak 4c9863cc54 Update changelog 2017-06-02 17:39:43 +02:00
Darko Poljak 8d5e207577 Update changelog 2017-06-01 23:08:25 +02:00
Darko Poljak 0b37c79bf4 Update changelog 2017-06-01 09:03:42 +02:00
Darko Poljak 29bebc4af4 Shorten ssh control path. 
On macos the path is too long due to long default TMP dir.
 2017-05-31 09:55:33 +02:00
Nico Schottelius 1322e85eac A new log file 2017-05-21 20:42:45 +02:00
Nico Schottelius ecc169111c Also update changelog 2017-05-16 12:10:10 +02:00
kamila 3e83ee82c9 Update changelog 2017-05-05 14:58:27 +02:00
kamila 0aec309077 Update changelog 2017-05-05 14:58:00 +02:00
kamila d1fae4a75e Update changelog 2017-05-05 14:57:18 +02:00
Darko Poljak 303c681bff Release 4.4.2 2017-03-08 19:08:59 +01:00
dmitrybogatov 6d277ef1f1 New type: __dot_file 2017-03-07 21:50:59 +01:00
Darko Poljak 72d73e307d Fix changelog. 2017-02-02 19:50:51 +01:00
Darko Poljak 0eda926b8c Fix changelog. 2017-02-02 19:49:39 +01:00
dmitrybogatov c4c2d45e59 New type: __hosts 2017-02-02 19:47:11 +01:00
Darko Poljak d3b3fef63b Merge remote-tracking branch 'ungleich/master' into cdist-type__hosts 2017-02-02 19:45:48 +01:00
Darko Poljak b03bed2425 Better describe -v option. 2017-01-28 13:49:19 +01:00
Darko Poljak 707f220f77 Update changelog. 2017-01-21 17:23:50 +01:00
Darko Poljak 61c45e7eab Update changelog. 2017-01-14 19:54:52 +01:00
Darko Poljak 4d10655014 release++ 2016-12-17 09:46:44 +01:00
Darko Poljak 7868165e91 Update changelog. 2016-12-16 20:27:00 +01:00
Darko Poljak 2b45405898 Update docs for types that used man.rst as symbolic links. 2016-12-16 08:19:41 +01:00
Darko Poljak d9c4a062ee Update changelog. 2016-12-14 09:08:43 +01:00
Darko Poljak d597b64705 Update changelog. 2016-12-13 11:41:04 +01:00
Darko Poljak a9cd6dc7c2 Fix changelog style 2016-12-08 20:08:08 +01:00
Darko Poljak b0911ab87d Improve __apt_mark (Ander Punnar from beta) 2016-12-08 20:04:17 +01:00
Darko Poljak 6d765c1ff7 enable-beta -> beta 2016-12-07 23:43:03 +01:00
Darko Poljak bc5f6c8923 Merge pull request #504 from darko-poljak/the-good-the-bad-and-the-ugly 
The Good, the Bad and the Ugly
 2016-12-07 18:45:56 +01:00
Darko Poljak 0f175bc65a Update changelog. 2016-12-05 08:53:59 +01:00
Darko Poljak 609977b7ff ugly->bad 2016-12-04 20:27:42 +01:00
Darko Poljak b24adcbe20 Fix changelog style. 2016-12-03 14:03:24 +01:00
Darko Poljak d07ad48651 Add reference to beta docs. 2016-12-03 10:21:00 +01:00
Darko Poljak 0fae040f77 Update changelog: release 4.4.0. 2016-12-03 09:52:49 +01:00
Darko Poljak 57d83be054 Update changelog. 2016-12-01 15:40:34 +01:00
Darko Poljak 4514bf1bd4 greatest -> highest 2016-12-01 09:14:51 +01:00
Darko Poljak ab71ab621d Fix typo. 2016-11-30 23:26:53 +01:00
Darko Poljak b819507415 Better document -v option. 2016-11-30 23:25:31 +01:00
Darko Poljak e7c3c15724 Deprecate -d, make -v log level counter. 2016-11-30 23:19:53 +01:00
Darko Poljak f473b671b1 Update AUTHORS in cdist man page. 2016-11-29 07:43:53 +01:00
Darko Poljak 36244b8a11 Update changelog. 2016-11-28 08:02:33 +01:00
Darko Poljak e663aaee08 Merge remote-tracking branch 'ungleich/master' into support-ipv6 2016-11-28 08:00:46 +01:00
Darko Poljak ed4e187132 Update changelog. 2016-11-27 17:11:14 +01:00
Darko Poljak 835e281c9c Notice IPv6 address [] notation. 2016-11-27 17:02:51 +01:00
Darko Poljak 28f2672c2d Update changelog. 2016-11-06 11:27:24 +01:00
Darko Poljak 536a64e56d Add install to cdist man page. 2016-10-13 21:38:34 +02:00
Darko Poljak cca6693b2e Merge install feature from 4.0-pre-not-stable. 2016-10-13 21:16:59 +02:00
Darko Poljak 54f752a42a Release 4.3.2 2016-10-13 18:51:43 +02:00
Darko Poljak aceb4ac13d Update telmich -> ungleich and mailing list refs. 2016-10-12 20:15:07 +02:00
Darko Poljak 67d93f3e0a Update changelog. 2016-10-12 16:59:45 +02:00
Darko Poljak 8b7cdd510a Merge pull request #477 from smwltr/git_repo_url 
change git.schottelius.org in docs because does not exist
 2016-10-12 16:51:11 +02:00
Darko Poljak aa4c3dc7bd Update changelog. 2016-10-10 12:25:10 +02:00
Darko Poljak ddd8eab06f Remove extra dot. 2016-10-08 11:45:50 +02:00
Darko Poljak c4e89eb245 Fix spelling. 2016-10-08 11:44:55 +02:00
Darko Poljak d49af95d3c Add warning message for faulty dependencies case. 2016-10-08 11:40:32 +02:00
Steven Armstrong 88b436b4c1 changelog++ 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2016-10-06 23:34:50 +02:00
Darko Poljak f87d31f423 Update changelog: new type __firewalld_start. 2016-09-17 17:33:53 +02:00
smwalter 232a909851 change documentation from git://git.schottelius.org/cdist to git://github.com/ungleich/cdist because git.schottelius.org does not exist. 2016-08-24 17:34:18 +09:00
Darko Poljak bc0efa9c4e Remove extra whitespace. 2016-08-22 19:07:13 +02:00
Darko Poljak e7e7cfdce2 Update changelog for release 4.3.1. 2016-08-22 18:49:14 +02:00
Darko Poljak 94d37913d1 Fix Makefile tabulation. 2016-08-22 10:36:40 +02:00
Darko Poljak 49506406fd Fix spelling. 2016-08-22 09:27:12 +02:00
Darko Poljak 2d72c08e9b Fix spelling. 2016-08-22 09:24:48 +02:00
Darko Poljak 3df61be7b8 Update cdist support web page. 2016-08-22 08:12:14 +02:00
Darko Poljak b5a79fbc8f Fix spelling (Dmitry Bogatov patch). 2016-08-22 08:11:49 +02:00
Darko Poljak 4121d14eab Update changelog for target_host in cache dir. 2016-08-22 08:00:23 +02:00
Darko Poljak d9d739cd44 Update HOSTFILE FORMAT description. 2016-08-20 07:49:52 +02:00
Darko Poljak f7ca14119a Merge remote-tracking branch 'ungleich/master' into cdist-type__hosts 2016-08-19 21:59:04 +02:00
Darko Poljak 40c2eeeabd Merge remote-tracking branch 'ungleich/master' into improve_hostfile 2016-08-19 21:57:24 +02:00
Darko Poljak 147460e3d0 Update changelog for new release: 4.3.0 2016-08-19 21:18:39 +02:00
Darko Poljak 72505e0f5f Add hostfile format to cdist man page. 2016-08-19 14:33:41 +02:00
Darko Poljak 7aa4b2d40a Support comments in hostfile, skip empty lines. 2016-08-19 13:37:57 +02:00
Darko Poljak 9f1e99e613 Add 2015-10-21 OpenNebulaConf-cdist ODP. 2016-08-19 10:37:24 +02:00
Darko Poljak 52a2315cd1 Turn off sphinx html SmartyPants. 2016-08-18 10:40:39 +02:00
Darko Poljak cd62853019 Add CAVEATS section to cdist man page. 2016-08-17 19:32:43 +02:00
Darko Poljak 80304d3340 Add 'Parallelization' chapter to docs. 2016-08-17 19:32:16 +02:00
Darko Poljak 640b7f9613 Add example for --jobs in cdist man page. 2016-08-17 08:07:57 +02:00
Darko Poljak 6ec30f509b Fix default remote copy/exec flags in docs. 2016-08-17 07:39:47 +02:00
Darko Poljak adac0113c5 Order options lexicographicaly. 2016-08-15 16:37:38 +02:00
Darko Poljak 1c07b63f1d Add -b/--enable-beta option for enabling beta functionalities. 2016-08-15 14:20:35 +02:00
Darko Poljak f858191976 Merge remote-tracking branch 'ungleich/master' into parallel-global-explorers-execution 2016-08-14 22:27:39 +02:00
Darko Poljak f4c02a9bca Merge remote-tracking branch 'ungleich/master' into new-target-env-vars 2016-08-14 21:51:03 +02:00
Darko Poljak 1274b87df9 Merge remote-tracking branch 'ungleich/master' into new-target-env-vars 2016-08-14 21:50:19 +02:00
Darko Poljak 38b94d019b Merge remote-tracking branch 'ungleich/master' into new-keyboard-type 2016-08-14 21:44:52 +02:00
Darko Poljak 0691f1da32 Add missing, fix existing in cdist man page. 2016-08-14 20:11:45 +02:00
Darko Poljak 7707d3dc72 Update changelog for GPLv3+ re-licensing. 2016-08-13 10:25:13 +02:00
Darko Poljak 33b6545a16 GPLv3+ relicensing. 2016-08-12 21:58:44 +02:00
Darko Poljak 55b134597a Update cdist docs with -j, --jobs option. 2016-08-12 21:20:37 +02:00
Darko Poljak 5f436f21b8 Transfer and run global explorers in parallel. 2016-08-12 21:14:56 +02:00
Darko Poljak dbcc94ab65 Add derived env vars for target hostname and fqdn. 2016-08-10 23:56:56 +02:00
Darko Poljak b400ae9c94 Separate __keyboard type. 2016-08-10 18:34:49 +02:00
Darko Poljak 8918186d53 Merge remote-tracking branch 'ungleich/master' into keyboard-locale_system-types 2016-08-10 18:29:57 +02:00
Darko Poljak ba0ea2206e Move legal to docs. 2016-08-10 18:18:54 +02:00
Nico Schottelius 9ce8f6bbb0 Merge branch 'master' of github.com:telmich/cdist 2016-08-05 12:33:58 +02:00
Nico Schottelius 67429479f0 Remove very old notes 
Not up-to-date anymore and might be misleading.
 2016-08-05 12:31:36 +02:00
Steven Armstrong e48486636e Merge pull request #467 from dheule/feature__filesystem 
new type __filesystem, first version

Awesome! Thanks!
 2016-08-02 16:14:09 +02:00
Nico Schottelius ad5ceac563 Update changelog for new type __sysctl 2016-08-02 09:25:11 +02:00
Nico Schottelius 4254046129 Update changelog (__locale_system) 2016-08-02 01:06:29 +02:00
Daniel Heule 2ed762cd72 new type __filesystem, first version 2016-07-28 14:48:32 +02:00
Darko Poljak 13a5d4963b Merge remote-tracking branch 'ungleich/master' into cdist-type__hosts 2016-07-26 12:25:45 +02:00
Darko Poljak cef47133bc Merge remote-tracking branch 'ungleich/master' into keyboard-locale_system-types 2016-07-26 12:22:37 +02:00
Darko Poljak d2997baf0b Update changelog: v 4.2.2 2016-07-26 07:50:27 +02:00
Darko Poljak 36627e2969 Merge remote-tracking branch 'ungleich/master' into socket-file-fix 2016-07-23 16:26:36 +02:00
Darko Poljak 6de632c0b9 Update changelog 2016-07-23 16:25:13 +02:00
Darko Poljak fdd1062b85 Update changelog 2016-07-23 16:20:46 +02:00
Darko Poljak 099893d11b Update changelog. 2016-07-23 16:19:34 +02:00
Darko Poljak 135b4fbadf Update changelog. 2016-07-23 16:17:43 +02:00
Darko Poljak 7e57575f9e Improve and fix reference doc and cdist man page. 2016-07-20 08:16:58 +02:00
Darko Poljak cab0381c2a Update license to GPLv3+ for my types and cdist man pages. 2016-07-20 07:55:48 +02:00
Darko Poljak 4e5b9492b8 Update docs with dist conf dir and .cdist conf dir info. 2016-07-19 13:00:14 +02:00
Darko Poljak b7d2ec4b6e 4.2.1 changelog 2016-07-18 20:12:48 +02:00
Darko Poljak 1815936b7d Fix import error when PYTHONPATH is not set. 2016-07-18 19:47:36 +02:00
Darko Poljak 804570d874 4.2.0 -> second run. 2016-07-16 00:55:54 +02:00
Darko Poljak 509a728211 Fix lost refs for feature files export. 2016-07-16 00:49:24 +02:00
Darko Poljak 5b40109646 Prepare for new release 4.2.0. 2016-07-15 21:53:14 +02:00
Darko Poljak f0f0ddbafb Fix changelog. 2016-07-10 21:29:47 +02:00
Darko Poljak 3b91ace4ea Additionaly improve hostdir fix. 2016-07-10 21:28:30 +02:00
Darko Poljak 17de2d9b79 Make signed github releases. 2016-07-10 21:17:42 +02:00
Darko Poljak 356e4b89f8 pep8 for setup and sphinx conf py files. 2016-07-10 11:09:09 +02:00
Nico Schottelius 9b2800b614 Merge pull request #453 from darko-poljak/improve-docs-build 
Improve docs build
 2016-07-07 21:49:38 +09:00
Stu Zhao 17c03950d9 Update changelog for commit a6643f0 2016-07-06 23:11:49 -04:00
Darko Poljak 759c491ef0 Update changelog for pep8. 2016-07-06 07:50:23 +02:00
Darko Poljak e76d06b382 Fix docs-dist target. 2016-07-04 16:56:07 +02:00
Darko Poljak 4dac520d98 Implement make targets: man, html, docs. 2016-07-04 12:21:01 +02:00
Darko Poljak 43ef5ec1ae Remove conflicting reqs changelog. 2016-07-04 10:14:19 +02:00
Darko Poljak 76563756ee Update Nico's cdist main page with installation instructions. 2016-06-30 15:28:57 +02:00
Darko Poljak 0f8ec6ce3a Update docs installation chapter. 2016-06-30 15:24:14 +02:00
Darko Poljak 0d64d6a5b6 docs/man -> docs/src and update Makefile and build-helper. 2016-06-30 15:13:21 +02:00
Darko Poljak 7d3c66859c Separate man pages by section number. 2016-06-30 12:18:42 +02:00
Darko Poljak f98208f250 Make man pages SEE ALSO by convention. Improve docs building. 2016-06-30 12:09:07 +02:00
Nico Schottelius 55cd9963db Merge pull request #447 from sleemburg/master 
Add openvz/lxc discovery
 2016-06-30 10:51:18 +09:00
Stephan Leemburg 7f5f09830a added changes to next: 2016-06-29 13:31:23 +02:00
Darko Poljak b4c77a6ef6 Fix empty man7 dir - Makefile fails. 2016-06-29 09:13:33 +02:00
Darko Poljak f2ccb00f3b Fix sphinx warning about html_static_path. 2016-06-29 09:12:40 +02:00
Darko Poljak 51c94e9e82 Restructure and fix and improve docs and manpages. 2016-06-29 07:48:34 +02:00
Darko Poljak a220d4805a Add cdist dir to sys.path for sphinx ext and cdist modules. 2016-06-26 16:28:10 +02:00
Darko Poljak b89077f9a5 Better sphinx manpage ext. Add custom dotman Makefile target for custom .cdist directory. 2016-06-23 16:08:59 +02:00
Stephan Leemburg 9300eda3c6 Add scientific 2016-06-22 13:32:51 +02:00
Darko Poljak 95461cded7 Fix tabulation (Dmitry Bogatov). 2016-06-22 13:24:12 +02:00
Darko Poljak a12b74b2f5 Resolve conflict. 2016-06-22 12:56:53 +02:00
Darko Poljak e66bedb43f Update changelog. 2016-06-22 12:50:35 +02:00
Darko Poljak 3e894d5a54 Update changelog. 2016-06-22 12:47:49 +02:00
Darko Poljak cfe422a5ab Merge branch 'master' into feature_files_export 2016-06-22 12:26:10 +02:00
Darko Poljak 5ee20f7886 Update changelog. 2016-06-22 12:23:31 +02:00
Darko Poljak 2e1cc0a89b Update changelog. 2016-06-22 12:20:34 +02:00
Darko Poljak 194f5af7b2 Merge branch 'master' into better-remote-err-reporting 2016-06-22 12:14:47 +02:00
Darko Poljak e6d439f2e9 Fix changelog: 'next'. 2016-06-12 20:51:14 +02:00
Darko Poljak 7fcdfcdb10 Merge pull request #440 from jdguffey/__jail_freebsd10 
__jail_freebsd10
 2016-06-12 20:50:14 +02:00
Darko Poljak 0049b62cca Add files conf subdirectory for static files. 2016-06-11 12:02:13 +02:00
Darko Poljak e3636e6ffc Merge branch 'master' into feature_files_export 2016-06-10 21:04:43 +02:00
Jake Guffey 35bf9aeaa5 Updated changelog for jail types 2016-06-06 18:01:14 -04:00
Darko Poljak 88b20610cb Update changelog. 2016-06-06 22:21:17 +02:00
Nico Schottelius d2e5fa7167 Add some thoughts about improving speed 2016-06-06 18:39:24 +02:00
Darko Poljak ab74da9c29 Prepare for new release. 2016-05-27 07:26:42 +02:00
Chris Lamb 8818d2fece Ensure build of reference documentation is reproducible. 
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
 2016-05-26 18:48:29 +01:00
Steven Armstrong dbcdc8a8ba use pool.sks-keyservers.net instead of subkeys.pgp.net 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2016-05-25 14:40:55 +02:00
Darko Poljak 3e94ea3d86 Cleanup. 2016-05-25 08:09:18 +02:00
Darko Poljak 03928eb23f Fix man section conf. 2016-05-25 08:06:13 +02:00
Darko Poljak 54834e277d Merge branch 'master' into new-docs-format 2016-05-25 07:39:53 +02:00
Darko Poljak 1b37b9fbb1 Minor sentence fixes. 2016-05-25 07:25:21 +02:00
Darko Poljak 69f3759a89 Update changelog for option -f. 2016-05-23 17:24:17 +02:00
Darko Poljak cf32b669ff Write sphinx rst docs. 2016-05-22 17:16:03 +02:00
Darko Poljak fa5175fee5 Allow both hosts sources: command line args and file. 2016-05-22 09:45:08 +02:00
Darko Poljak 4fce4a631c Add -f option for reading hosts from file or stdin. 2016-05-22 09:22:39 +02:00
Darko Poljak 8a079b3440 Fix spelling errors - Bogatov's patch. 2016-05-05 09:58:35 +02:00
Darko Poljak a4a31c5880 Prepare for 4.0.0. 2016-05-04 08:20:55 +02:00
Darko Poljak cf451f0bea Merge with master. 2016-04-28 09:09:32 +02:00
Darko Poljak 9a9836a047 Remove unnecessary global explorers. 2016-04-21 08:28:47 +02:00
Darko Poljak 856678b09c Update changelog. 2016-04-15 08:40:08 +02:00
Darko Poljak 641b511f1a Update changelog. 2016-04-15 08:39:33 +02:00
Darko Poljak 0ba27d8326 Fix text typos. 2016-04-13 08:29:38 +02:00
Darko Poljak 2410b30b40 Update changelog 2016-04-11 19:30:45 +02:00
Darko Poljak 3062421cf5 Fix bug with parallel hosts operation and specified output path. 2016-04-04 08:03:54 +02:00
Darko Poljak 5fbc7f7d88 Sync with master. Add changelog. 2016-03-31 18:40:34 +02:00
Darko Poljak de74b85747 Update changelog. 2016-03-31 13:21:35 +02:00
Darko Poljak d0d0c258d6 Add ssh mux options by default if available. 2016-03-18 23:34:02 +01:00
Steven Armstrong 32557cfa2c Merge remote-tracking branch 'ungleich/master' 2016-03-17 23:42:59 +01:00
Steven Armstrong 76a78f0d9b /spaces/tab/ 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2016-03-17 23:38:57 +01:00
Steven Armstrong afbb3df280 remove legacy cruft 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2016-03-17 23:35:59 +01:00
Nico Schottelius 36d6ffbe74 Merge branch 'master' of github.com:telmich/cdist 2016-02-25 07:19:45 +01:00
Nico Schottelius 404f2051a8 ++changes 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2016-02-25 07:19:32 +01:00
Nico Schottelius fcb9e3edd9 ++changes 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2016-02-25 07:18:27 +01:00
Steven Armstrong d2dd706a1a Merge remote-tracking branch 'telmich/master' 2015-08-13 20:48:08 +02:00
Nico Schottelius 56e51f834f ++changes 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-07-29 12:54:30 +02:00
Steven Armstrong 6c47dfbd54 Merge remote-tracking branch 'telmich/master' 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-06-01 10:31:53 +02:00
Steven Armstrong 414542cd82 changes++ 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-05-22 21:14:41 +02:00
Steven Armstrong 8062fd9d6c changes++ 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-05-22 21:10:16 +02:00
Nico Schottelius 39326cb03a Merge branch 'no-dot-cdist' 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-20 17:11:36 +02:00
Nico Schottelius b68091e032 integrate __pacman_conf_integrate 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-20 17:00:35 +02:00
Nico Schottelius 4a5bd2069f Merge branch 'master' into feature_install_and_preos 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-19 15:16:56 +02:00
Nico Schottelius 0d42829afc ++changes 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-19 12:00:03 +02:00
dmitrybogatov 10735ffb84 Description: Fix spelling in manuals 
Forwarded: yes
Last-Update: 2015-05-14
 2015-05-19 11:58:50 +02:00
Nico Schottelius 6ff6604941 +logs 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-19 10:02:53 +02:00
Nico Schottelius 72bf86646d Merge branch 'master' into feature_install_and_preos 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-18 14:42:07 +02:00
Nico Schottelius fc09cdb720 ++changes 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-16 17:47:42 +02:00
Nico Schottelius 10662c48df +consul 0.5.1 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-16 17:43:46 +02:00
Nico Schottelius ac866107fa Merge remote-tracking branch 'origin/master' into feature_install_and_preos 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-16 16:44:11 +02:00
Nico Schottelius 156ff71430 ++changes 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-13 08:28:27 +02:00
Nico Schottelius 7d2fef4b03 ++changes 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-12 01:03:33 +02:00
Nico Schottelius 8c048a640d ++changes 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-08 13:43:09 +02:00
Nico Schottelius bcaca9c268 Merge branch 'preos' into 4.0-pre-not-stable 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-05 13:54:38 +02:00
Nico Schottelius e177bac054 Merge branch 'master' into preos 2015-03-28 03:06:15 +09:00
Nico Schottelius 4f2d529085 add changes for 3.1.12 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-03-19 18:21:06 +09:00
Nico Schottelius e225ec3f77 ++changes 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-03-05 19:48:53 +01:00
Nico Schottelius 3be1e9a88c ++changes 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-03-05 19:45:41 +01:00
Steven Armstrong 2fcfa42a26 changelog++ 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-03-05 16:40:36 +01:00
Nico Schottelius 73c77dd2d3 Let core use random .cdist directory for objects 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-03-05 15:02:26 +01:00
Nico Schottelius ff00df72ad Merge branch 'master' into no-dot-cdist 2015-03-05 11:08:49 +01:00
Nico Schottelius 64e22bdb11 add new cdist type: __firewalld_rule 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-03-01 18:49:40 +01:00
Nico Schottelius 47c17118f6 Update changelog for 3.1.11 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-02-27 14:46:21 +01:00
Nico Schottelius 587a87e976 +changes 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-02-27 14:42:49 +01:00
Nico Schottelius 66ad275212 make Nico just another committer - no special role 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-02-24 14:50:39 +01:00
Steven Armstrong 2c7ab566e1 add new types to manage consul and friends 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-02-24 13:10:17 +01:00
Steven Armstrong 4f7ae8425d New type __staged_file: Manage staged files 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-02-24 13:01:48 +01:00
Steven Armstrong 041569b41c new type __config_file to manage configuration files 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2015-02-24 12:47:51 +01:00
Nico Schottelius e3ae9a09bb ++changes 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-02-18 10:23:39 +01:00
Nico Schottelius 6e483497de ++changes 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-02-10 23:28:30 +01:00
Nico Schottelius 82ffde7786 update changelog 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-02-10 22:54:03 +01:00
Nico Schottelius c4301696b0 Merge branch 'master' into preos 2015-02-10 22:01:18 +01:00
Nico Schottelius e98ff2879a ++fruits 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-01-29 13:58:04 +01:00
Nico Schottelius bc29bb2b3c dependency tree v3 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-01-29 13:54:45 +01:00
Nico Schottelius 57d372bb08 today is the release day 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2015-01-06 15:36:14 +01:00
Nico Schottelius 6610a9c384 update clone url for cdist 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2014-12-25 00:02:26 +01:00
Nico Schottelius b4d23c85f7 update changelog 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2014-12-23 08:26:56 +01:00
Nico Schottelius 494b6cbbf9 Merge branch 'master' into 4.0-pre-not-stable 2014-12-11 17:13:52 +01:00
Nico Schottelius 128e568ae3 document change 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2014-12-09 20:03:14 +01:00
Nico Schottelius a68d39a3a2 update changelog 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2014-12-09 19:55:03 +01:00
Nico Schottelius 00d5524af9 steven is right 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2014-11-11 21:07:32 +01:00
Nico Schottelius ab84a3cece +discussions 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2014-11-11 15:06:18 +01:00
Nico Schottelius fea5fb3801 add new presentations from linux erfa 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2014-11-07 14:47:05 +01:00
Nico Schottelius 161f61327b add presentation of today 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2014-11-07 09:43:31 +01:00
Nico Schottelius c67a6d1895 ++changes 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2014-10-23 16:33:43 +09:00
Nico Schottelius d363a0b236 correct release date for 3.1.9 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2014-10-17 00:54:27 +09:00
Nico Schottelius d16c96ab9d +release 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2014-10-06 17:56:24 +02:00
Nico Schottelius fb45416193 ++changes 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2014-10-02 15:22:27 +02:00
Nico Schottelius 6d795fc5dd release 3.1.8: allow users to upgrade their packages 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2014-10-01 16:03:16 +02:00
Ricardo Catalinas Jiménez 3e7c804fe5 Explain in the doc how to create a global dependency 2014-09-29 22:37:50 +01:00
Ricardo Catalinas Jiménez 9184c310f2 Fix formatting of manifest doc 2014-09-29 22:37:50 +01:00
Ricardo Catalinas Jiménez e1c45e11fc Fix style typos in type's doc 2014-09-29 22:37:50 +01:00
Nico Schottelius ba32c2d594 +__package_pkgng_freebsd 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2014-09-29 21:20:16 +02:00
Nico Schottelius 2ec357c454 ++changes 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2014-09-29 21:15:56 +02:00
Nico Schottelius a3ac99a6c8 ++changes 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2014-09-29 11:16:13 +02:00
Nico Schottelius cba6ce4882 +changes 
Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2014-09-29 11:14:24 +02:00
Ricardo Catalinas Jiménez 4e9b1780e9 Fix typo in reference doc 2014-09-21 11:53:04 +01:00
Nico Schottelius 72947b7f6b Fix typo in cdist-explorer 
Thanks, henk!

15:53 < henk> telmich: s/Except/Expect/ in
http://www.nico.schottelius.org/software/cdist/man/latest/man7/cdist-explorer.html

Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>
 2014-09-16 15:59:08 +02:00
Nico Schottelius ea633d3f2e ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-09-14 13:52:35 +02:00
Nico Schottelius 9ecbf9f1cc Merge branch 'master' into preos 2014-09-10 17:47:24 +02:00
Nico Schottelius eb20e10601 update changelog / release date 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-08-18 21:30:13 +02:00
Nico Schottelius 5751a37c3e ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-08-17 12:49:09 +02:00
Nico Schottelius 28ab1c92dd add more examples for messaging 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-06-26 17:17:29 +02:00
Nico Schottelius c6ad2e60b3 remove obsolete todos ... people believe they still need to be fixed! 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-06-26 17:11:35 +02:00
Nico Schottelius 104b9ce5d1 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-06-26 15:25:05 +02:00
Nico Schottelius c7240c4861 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-06-25 10:37:16 +02:00
Nico Schottelius 6249921398 add speeches from ucms14 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-06-19 14:11:14 -04:00
Nico Schottelius a0d5e57ca8 add openclouddays presentation 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-06-17 16:47:39 -04:00
Nico Schottelius 7674cf139b ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-06-16 08:04:22 +02:00
Nico Schottelius 379c1da007 ++changes(3.1.6) 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-06-16 07:57:40 +02:00
Nico Schottelius 8e060a1d83 release 4.0.0pre3 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-06-13 13:51:03 +02:00
Nico Schottelius 5f9eef3bbb Merge branches 'preos' and 'install_integration' into 4.0-pre-not-stable 2014-06-13 13:34:42 +02:00
Nico Schottelius 9bf2d58a8f Merge branch 'master' into install_integration 2014-06-13 13:34:31 +02:00
Nico Schottelius 3b4258c34e Merge branch 'master' into preos 2014-06-13 13:33:28 +02:00
Nico Schottelius 76d91e4b59 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-06-11 00:36:12 +02:00
Nico Schottelius 3592a0c6dd +suse support in __locale and __hostname 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-06-10 23:50:53 +02:00
Nico Schottelius 13943e710c ++changes(3.1.6) 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-06-10 23:28:07 +02:00
Nico Schottelius 004e90e9b9 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-05-20 07:46:35 +02:00
Nico Schottelius 066d0bf15a speech from linux erfa 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-05-19 19:27:33 +02:00
Nico Schottelius 658e759fa4 add speech from berlin, linuxtag 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-05-09 00:26:34 +02:00
Nico Schottelius f255ac9b0f Merge branch 'bugfix_issue_329' of https://github.com/dheule/cdist 2014-05-06 15:16:11 +02:00
Nico Schottelius c363fc24de begin to make OBJECT_MARKER dynamic 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-05-06 00:28:18 +02:00
Nico Schottelius ffe24c612c ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-05-05 22:46:04 +02:00
Daniel Heule d86e50172a remove the "BETA FEATURE" flags from CDIST_ORDER_DEPENDENCY and CDIST_OVERRIDE. 2014-05-05 19:08:06 +02:00
Nico Schottelius f2459df682 prepare release 3.1.4 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-05-04 09:25:17 +02:00
Nico Schottelius beab2888fa ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-05-04 08:53:10 +02:00
Nico Schottelius 6482b5df3f ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-05-04 08:52:06 +02:00
Nico Schottelius 99ce837d42 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-05-04 08:43:53 +02:00
Nico Schottelius 2d3e5439a7 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-05-04 08:39:57 +02:00
tpo 2ff61d1965 wording 2014-04-30 16:42:35 +02:00
tpo e5a12803ff expand "Dependencies" paragraph 2014-04-30 15:57:44 +02:00
tpo 5b8ab385f2 clarify docu 2014-04-30 15:50:14 +02:00
tpo 779374ad94 wording 2014-04-30 11:59:07 +02:00
tpo dc7f5ab628 typo 2014-04-30 11:57:10 +02:00
tpo cdb5b9c82a wording 2014-04-30 11:53:04 +02:00
tpo 9ffdde3646 wording 2014-04-30 11:45:13 +02:00
tpo 8ae9bcfec9 whitespace 2014-04-30 11:28:13 +02:00
tpo 28a734fcc0 asciidoc syntax fix 2014-04-30 11:17:09 +02:00
tpo ba0d6e83b2 fix asciidoc 2014-04-29 21:47:39 +02:00
tpo 7b7f17cae5 english 2014-04-29 21:33:18 +02:00
Nico Schottelius bfbc621010 ++releasedate 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-04-29 18:10:50 +02:00
Nico Schottelius 9127e06109 CentOS support for __hostname 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-04-25 01:48:58 +02:00
Nico Schottelius 0d36c9487a ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-04-14 13:47:56 +02:00
Nico Schottelius aa8c5555b7 document __files 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-04-14 09:46:52 +02:00
Nico Schottelius 702a07b2d1 relese 3.1.2 = today 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-04-12 19:45:37 +02:00
Nico Schottelius a568d5da0f ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-04-12 19:43:52 +02:00
Nico Schottelius 152f02bb62 document CDIST_REMOTE_SHELL 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-04-12 19:42:37 +02:00
Nico Schottelius 432e65b218 document CDIST_LOCAL_SHELL 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-04-12 19:41:39 +02:00
Nico Schottelius 203708e5da ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-04-06 20:33:29 +02:00
Nico Schottelius 84159d18e0 Merge branch 'master' into 4.0-pre-not-stable 2014-03-31 22:16:30 +02:00
Nico Schottelius 47b6149803 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-03-31 21:23:40 +02:00
Nico Schottelius 63347497ad --typo before release 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-03-26 13:14:26 +01:00
Nico Schottelius c3de952d55 release date for 3.1.1 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-03-26 13:09:48 +01:00
Nico Schottelius 94c7d4cacf ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-03-26 11:20:54 +01:00
Nico Schottelius ae477d69c8 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-03-26 11:18:35 +01:00
Nico Schottelius 653012ee5f ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-03-26 11:17:16 +01:00
Nico Schottelius dfdd77eff4 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-03-26 11:00:38 +01:00
Nico Schottelius 6e4533cb14 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-03-20 20:40:04 +01:00
Daniel Heule e1766aa070 reverted the change to .html in generating the reference, since I have 
fooled myself ...
 2014-03-20 19:04:09 +01:00
Daniel Heule b5b1a25e4f fixed some formulations and removed a debug statement 2014-03-20 18:53:19 +01:00
Daniel Heule b87b5eab31 documentation to __object in execution run 2014-03-20 16:23:28 +01:00
Nico Schottelius 10a71eb35a notes for 3.0 -> 3.1 update 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-03-19 19:00:39 +01:00
Nico Schottelius 2b03ccd776 changes for 3.1.0 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-03-19 18:57:11 +01:00
Nico Schottelius bcca8a637b Merge branch 'master' into type__rbenv 2014-03-13 10:30:48 +01:00
Nico Schottelius d288ee1cde ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-03-11 15:40:44 +01:00
Nico Schottelius 19f6126a0f ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-03-03 07:42:27 +01:00
Nico Schottelius d6b7033f2b ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-22 10:13:51 +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 ff897bc904 Merge branch 'master' into 4.0-pre-not-stable 2014-02-14 20:58:19 +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 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 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 2afa0ad2fc ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-12 17:07:07 +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
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 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
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