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

291 Commits

Author SHA1 Message Date
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 51c94e9e82 Restructure and fix and improve docs and manpages. 2016-06-29 07:48:34 +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 0049b62cca Add files conf subdirectory for static files. 2016-06-11 12:02:13 +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
Darko Poljak ab74da9c29 Prepare for new release. 2016-05-27 07:26:42 +02: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 54834e277d Merge branch 'master' into new-docs-format 2016-05-25 07:39:53 +02:00
Darko Poljak 69f3759a89 Update changelog for option -f. 2016-05-23 17:24:17 +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
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 0d42829afc ++changes 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-05-19 12:00:03 +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 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 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