Commit Graph

4208 Commits

Author SHA1 Message Date
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 d0ef6b6583 Merge branch 'issue/271' of git://github.com/asteven/cdist 2014-01-22 22:05:55 +01:00
Steven Armstrong 7a0b3cd7b7 python-software-properties still needed for older ubuntu versions
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-01-22 21:21:34 +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
Daniel Heule b75481a4d4 parameter default handling in __key_value type corrected 2014-01-21 23:18:10 +01:00
Daniel Heule 360b42e892 parameter default handling in __zypper_repo type corrected 2014-01-21 22:57:06 +01:00
Daniel Heule 08b8270739 parameter default handling in __zypper_service type corrected 2014-01-21 22:45:35 +01:00
Daniel Heule 02c3fe4988 parameter default handling in __qemu_img type corrected 2014-01-21 22:33:10 +01:00
Daniel Heule 92e67182a6 parameter default handling in __cdist type corrected 2014-01-21 22:24:35 +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 26fcbbb4ef Merge branch 'master' into install_integration 2014-01-21 17:17:20 +01:00
Nico Schottelius 5f79efb201 Merge branch 'master' into preos 2014-01-21 16:46:22 +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 51c9662475 DO NOT USE ECHO WHEN SOMETHING MAY CONTAIN A B-A-C-K-S-L-A-S-H
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-21 16:41:34 +01:00
Nico Schottelius d89cdbae0a Merge branch 'master' into preos 2014-01-21 16:05:03 +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
Daniel Heule 64f4cff3cb Shell selection support via ENV
CDIST_LOCAL_SHELL for local scripts
CDIST_REMOTE_SHELL for remote scripts
2014-01-20 20:30:37 +01:00
Nico Schottelius 4bd6158260 add log from today
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 16:19:41 +01:00
Nico Schottelius 295c21b4e9 Merge branch 'master' into 4.0-pre-not-stable 2014-01-20 14:58:55 +01:00
Nico Schottelius 7eabdc3cf9 ignore pypi-release marker
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:56:41 +01:00
Nico Schottelius 8ed5f85f9d do not change to the masterbranch...
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:56:19 +01:00
Nico Schottelius 5a0a3971b0 do not change to the masterbranch...
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:48:05 +01:00
Nico Schottelius a3c5d32a54 fix building manpage of __install_partition_msdos
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:45:42 +01:00
Nico Schottelius 7fb322c83c Merge branch 'master' into 4.0-pre-not-stable 2014-01-20 14:43:56 +01:00
Nico Schottelius f034ed6027 do not merge, if not coming from the master branch
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:43:48 +01:00
Nico Schottelius 131ee68aed Merge branch 'master' into 4.0-pre-not-stable 2014-01-20 14:41:07 +01:00
Nico Schottelius e40fde92fc allow releases from non-master branch, if the person knows what he does
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:40:54 +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 2388188fbb Merge branches 'preos' and 'install_integration' into 4.0-pre-not-stable 2014-01-20 14:28:49 +01:00
Nico Schottelius 7988b3f8b9 Merge branch 'master' into preos 2014-01-20 14:28:37 +01:00
Nico Schottelius c16d542da4 Merge branch 'master' into install_integration 2014-01-20 14:28:29 +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 b6bae508a8 use hostnamectl, if available, else use /etc/hostname and hostname
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:26:22 +01:00
Nico Schottelius 8d5357107b use uname -n in hostname explorer
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 14:07:31 +01:00
Steven Armstrong aee97cffd6 install proper packages
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2014-01-20 14:01:29 +01:00
Nico Schottelius cd6abf379a allow hostname -f to fail and return empty output
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 13:52:49 +01:00
Nico Schottelius 9123940255 port selection of first part into gencode-remote
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 13:51:48 +01:00
Nico Schottelius 29d4f910bc do not change parameters
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 13:50:42 +01:00
Nico Schottelius 5279b7239c import __hostname - Thanks, Steven!
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 13:47:45 +01:00
Nico Schottelius 13001924c0 do not touch a visible file during release process
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 10:52:28 +01:00
Nico Schottelius c790014cd5 add scaled version of the cdist logo
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 10:11:23 +01:00
Nico Schottelius b4644c9c2e add readme / warning for 4.x series
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 10:08:46 +01:00
Nico Schottelius e463f84333 add changelog for 4.x cdist series
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 10:04:42 +01:00
Nico Schottelius f3bf1b3ea1 merge preos and install
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 09:47:45 +01:00
Nico Schottelius 4cfedb1787 +curl
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 09:42:53 +01:00
Nico Schottelius b125c0a4f2 create output directory, if it does not exist
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2014-01-20 09:21:50 +01:00