fancsali/cdist-backup
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
5376 commits 91 branches 177 tags 18 MiB
Commit graph

405 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Nico Schottelius
ea633d3f2e ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-09-14 13:52:35 +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
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
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
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
ffe24c612c ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-05-05 22:46:04 +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
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
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
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
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
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
4ce52c5a9d -ws 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-15 11:31:39 +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
1cdcb12ebd ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-14 20:51:20 +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
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
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
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
03f99a0e55 Merge branch 'preos' into 4.0-pre-not-stable 2014-02-08 00:32:39 +01:00
Nico Schottelius
f87fc63a79 cdist 3.0.7 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-08 00:13:33 +01:00
Nico Schottelius
49764ae5c7 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-06 15:58:25 +01:00
Nico Schottelius
98e7b7644c release 3.0.6 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-06 11:35:45 +01:00
Nico Schottelius
c1d2ceefc2 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-06 00:10:02 +01:00
Nico Schottelius
5389d71905 Merge branch 'master' into 4.0-pre-not-stable 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/config.py
	cdist/emulator.py
	docs/changelog
 2014-02-05 23:22:04 +01:00
Nico Schottelius
2e6a827513 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-05 23:15:56 +01:00
Nico Schottelius
c663d87ba6 release 3.0.5 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-05 22:53:45 +01:00
Nico Schottelius
34f2f7f038 setting up CDIST_ALLOW_OVERRIDE to any value is ok - do not depend on true/yes/ja 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-05 21:09:24 +01:00
Nico Schottelius
2363cdda47 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-05 20:50:23 +01:00
Nico Schottelius
ab3b151918 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-31 21:52:43 +01:00
Nico Schottelius
d5f04b26c8 ++changes(3.0.4) 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-29 23:19:18 +01:00
Nico Schottelius
e52a059adf ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-27 19:38:26 +01:00
Nico Schottelius
565e11b16d ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-27 14:18:56 +01:00
Nico Schottelius
8216ec88e4 Merge branch 'master' into 4.0-pre-not-stable 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	docs/changelog
 2014-01-24 01:20:12 +01:00
Nico Schottelius
a62e4aade3 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-22 22:07:12 +01:00
Nico Schottelius
87d72dfc1a release: 3.0.3 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-22 00:46:35 +01:00
Nico Schottelius
0a3b5d33d9 Merge branch 'master' into 4.0-pre-not-stable 2014-01-22 00:45:12 +01:00
Nico Schottelius
0e49ccbf43 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-22 00:44:56 +01:00
Nico Schottelius
cb648fce33 Merge branches 'install_integration' and 'preos' into 4.0-pre-not-stable 2014-01-21 17:17:29 +01:00
Nico Schottelius
520bcc29a7 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-21 16:43:02 +01:00
Nico Schottelius
ba0c56efbd Merge branch 'master' into 4.0-pre-not-stable 2014-01-21 14:05:44 +01:00
Nico Schottelius
6746ba8279 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-21 09:16:45 +01:00
Nico Schottelius
3ca911dbc6 integrate install and preos support 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-20 14:37:50 +01:00