Commit graph

193 commits

Author SHA1 Message Date
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
Nico Schottelius
f7c4437873 ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:27:26 +01:00
Nico Schottelius
c47abb6af7 ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-19 23:29:56 +01:00
Nico Schottelius
f3b7fc1514 release 3.0.2
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-19 21:38:38 +01:00
Nico Schottelius
c4140a7c7b ++changes(3.0.2)
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-18 15:57:39 +01:00
Nico Schottelius
f23999c8d3 ++changes(3.0.2)
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-17 10:41:23 +01:00
Nico Schottelius
ad09a9258e ++changes(3.0.2)
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-15 13:25:37 +01:00
Nico Schottelius
3c0790f080 ++changes(3.0.2)
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-14 10:25:28 +01:00
Nico Schottelius
f80501d65c ++changes(3.0.1)
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-14 08:44:41 +01:00
Nico Schottelius
5cb5c3bfdf update changelog
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-10 11:26:23 +01:00
Nico Schottelius
d9de8b1dda ++changes(3.0.1)
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-10 00:42:01 +01:00
Nico Schottelius
44dbe6f2fe ++changes(3.0.1)
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-09 09:38:46 +01:00
Nico Schottelius
57b700d11b ++changes(3.0.1)
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-08 14:54:21 +01:00