Commit graph

4840 commits

Author SHA1 Message Date
Darko Poljak
07ef7cf2a0 Update building on FreeBSD. 2016-07-07 07:53:21 +02:00
Nico Schottelius
959f160987 Merge pull request #459 from zhaostu/master
Update changelog for commit a6643f0
2016-07-07 13:24:34 +09:00
Stu Zhao
17c03950d9 Update changelog for commit a6643f0 2016-07-06 23:11:49 -04:00
Nico Schottelius
82d9351a6c Merge pull request #458 from zhaostu/master
Explore machine type for virtualbox guest
2016-07-07 11:07:46 +09:00
Stu Zhao
a6643f0d7f Explore machine type for virtualbox guest 2016-07-06 18:39:27 -04:00
Nico Schottelius
acf3b3575a Merge pull request #456 from darko-poljak/pep8
Pep8
2016-07-06 17:18:01 +09:00
Darko Poljak
22abe43e85 Make better msg for exec/util unsupported stderr output. 2016-07-06 08:25:31 +02:00
Darko Poljak
759c491ef0 Update changelog for pep8. 2016-07-06 07:50:23 +02:00
Darko Poljak
64efa04599 pep8 2016-07-05 20:44:24 +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
Nico Schottelius
b5a388a69d Merge pull request #454 from darko-poljak/fix-conflicting-reqs
Revert dependency change (see bd9008794c)
2016-07-04 18:29:24 +09:00
Darko Poljak
43ef5ec1ae Remove conflicting reqs changelog. 2016-07-04 10:14:19 +02:00
Darko Poljak
92d96c14b9 Undo reqs conflict detection, continue appending new reqs. 2016-07-04 10:11:11 +02:00
Darko Poljak
72345f5516 Make union of existing and new requirements instead of conflict error. 2016-06-30 20:37:08 +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
0dfb4aee73 sphinx> ':manpage:' -> ':strong:' 2016-06-30 15:13:33 +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
b04ab0b630 Fix Makefile for new sphinx build. 2016-06-30 12:28:14 +02:00
Darko Poljak
2981fc20da Merge pull request #451 from darko-poljak/manpages-fix
Make man pages SEE ALSO by convention. Improve docs building.
2016-06-30 12:19:06 +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
b57e3d84e1 Merge pull request #450 from darko-poljak/new-docs-struct
Restructure and fix and improve docs and manpages.
2016-06-29 07:47:42 +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
7a9a04592b Fix Makefile for dotman target. 2016-06-25 19:30:22 +02:00
Darko Poljak
f6ea90c3a5 Update remote.py according to new exec_util api. 2016-06-24 11:18:24 +02:00
Nico Schottelius
ca4cb07b16 Merge pull request #449 from darko-poljak/fix-sphinx-manpages
Better sphinx manpage ext. Add custom dotman Makefile target for custom .cdit directory
2016-06-24 09:49:01 +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
Darko Poljak
e819dd0470 Merge pull request #448 from darko-poljak/fix_local_process_err_handling
Fix process error handling in local.
2016-06-23 11:00:07 +02:00
Darko Poljak
d48b65ed53 Fix process error handling in local. 2016-06-23 10:56:37 +02:00
Steven Armstrong
ce26deb706 add support for new check types
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2016-06-22 23:58:14 +02:00
Steven Armstrong
6944998a19 add new --wait parameter for consul-template
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2016-06-22 23:57:25 +02:00
Steven Armstrong
75b32328b6 use latest consul-template version by default
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2016-06-22 23:56:57 +02:00
Steven Armstrong
96b49f4e99 consul-template is no longer distributed as a tar. it is now a zip archive
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2016-06-22 23:56:27 +02:00
Steven Armstrong
1ed0d6bbe3 source for old consul-template versions have changed
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2016-06-22 23:55:20 +02:00
Steven Armstrong
4a7823d9b5 new consul-template version
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2016-06-22 23:54:58 +02:00
Stephan Leemburg
0f2b0bfdf1 Merge branch 'master' of https://github.com/sleemburg/cdist 2016-06-22 13:34:39 +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
Stephan Leemburg
98160624a0 Add openvz/lxc discovery 2016-06-22 13:21:10 +02:00
Stephan Leemburg
9802467bbb Add openvz/lxc discovery 2016-06-22 13:17:03 +02:00
Darko Poljak
24932fe891 Merge pull request #446 from darko-poljak/feature_files_export
Feature files export
2016-06-22 12:56:35 +02:00
Darko Poljak
a12b74b2f5 Resolve conflict. 2016-06-22 12:56:53 +02:00
Darko Poljak
0ae6eca754 Merge pull request #445 from darko-poljak/fix-dependency-conflict
Conflicting requirements bugfix.
2016-06-22 12:51:28 +02:00