Commit Graph

34387 Commits

Author SHA1 Message Date
rallytime
c730da8f84 Fix trailing whitepsace 2014-07-30 08:50:45 -06:00
Joseph Hall
77e81614bd Merge pull request #14610 from rallytime/cloud_docs
Update docs for using salt-cloud on OSX to install curl-ca-bundle
2014-07-30 00:06:44 -06:00
Joseph Hall
2333246dec Merge pull request #14616 from garethgreenaway/14308_archive_tar_documentation
Fixing docstrings for archive.tar to be consistent.
2014-07-30 00:03:52 -06:00
Gareth J. Greenaway
053986b134 Fixing docstrings for archive.tar to be consistent. Per 14308. 2014-07-29 20:45:19 -07:00
Pedro Algarvio
9ed937cd5b Merge pull request #14603 from garethgreenaway/bootstrap_fixes
Fixing bootstrap script to install python-apt for Ubuntu & Debian minions
2014-07-30 03:52:25 +01:00
Samuel Smith
f0a55cf5ca Merge pull request #14611 from SmithSamuelM/sam_2014.7
Support for updated presence behavior in Raetv0.2.12
2014-07-29 15:47:58 -06:00
Samuel M Smith
9b9be0a387 Merge remote-tracking branch 'upstream/2014.7' into sam_2014.7 2014-07-29 15:46:42 -06:00
rallytime
ea4b045944 Update docs for using salt-cloud on OSX to install curl-ca-bundle 2014-07-29 15:29:33 -06:00
Samuel M Smith
3362c998af Support for new reapeds dict produced by presence management
Requires Raet v02.11
2014-07-29 14:55:48 -06:00
Gareth J. Greenaway
40e8c32feb Fixing bootstrap script to install python-apt for Ubuntu minions and Debian minions greater than the 5.0 (Lenny) release. With some recent changes related to virtual packages, python-apt is now necessary to be able to manage packages. 2014-07-29 11:54:15 -07:00
Mike Place
f503e98f0f Merge pull request #14599 from cachedout/rpm_redir_2014_7
Avoid redirects for RHEL5 RPMs to workaround a bug in RPM
2014-07-29 09:54:43 -06:00
Mike Place
2951d1b72e Avoid redirects for RHEL5 RPMs to workaround a bug in RPM
Conflicts:
	salt/cloud/deploy/bootstrap-salt.sh
2014-07-29 09:53:01 -06:00
Erik Johnson
36333e4d49 Merge branch 'bp-14594' into 2014.7 2014-07-29 10:36:30 -05:00
Egor Potiomkin
852571056e prevent gitfs.py changing load variable that is used by other fs modules too 2014-07-29 10:35:42 -05:00
C. R. Oldham
fe5ba8874e Merge pull request #14570 from gtmanfred/2014.7
close pylint errors
2014-07-29 09:18:18 -06:00
Mike Place
c3c8dc7a4c Merge pull request #14551 from s0undt3ch/2014.7
Update to latest, v2014.07.27 bootstrap script.
2014-07-29 09:16:23 -06:00
C. R. Oldham
dfff95656a Merge pull request #14547 from makinacorpus/fix3
aptpkg: restore support for lenny...
2014-07-29 08:43:46 -06:00
Pedro Algarvio
e101a8453d Update to latest, v2014.07.29 bootstrap script.
* Shallow clone Salt's repository for speed improvements. In case of failure, resume old behaviour.
* Fixed bug introduced in 0577622 when salt-api service install and checks were added
* Distro Support Fixed:
  * Fixed infinite loop when handling RHEL dependencies. Thanks Dan Mick(@dmick).
2014-07-29 13:23:38 +01:00
Daniel Wallace
d844fdedaf closes #14586 2014-07-28 20:42:56 -05:00
Daniel Wallace
88792c67bd closes #14587 2014-07-28 20:41:21 -05:00
Daniel Wallace
44401243b0 closes #14588 2014-07-28 20:39:03 -05:00
Daniel Wallace
8f2960a8f6 closes #14585 2014-07-28 20:36:45 -05:00
Daniel Wallace
e3b9cda6cb closes #14582 2014-07-28 19:52:01 -05:00
Daniel Wallace
d1f767be4f closes #14580 2014-07-28 19:32:33 -05:00
Daniel Wallace
855fd9f054 closes #14563
need to escape the {} for the format dictionary
2014-07-28 19:30:35 -05:00
Daniel Wallace
34ac8a91bc closes #14573 2014-07-28 19:08:55 -05:00
Daniel Wallace
133252a10e closes #14571 2014-07-28 19:08:28 -05:00
Daniel Wallace
1bba39f500 closes #14576 2014-07-28 19:06:40 -05:00
Daniel Wallace
cab6cb79b7 closes #14577 2014-07-28 19:05:58 -05:00
Daniel Wallace
143b0681d4 closes #14568 2014-07-28 18:43:32 -05:00
Daniel Wallace
c1dcd62aac closes #14561
toggle [NUMBER [FLAG]] toggle the state of FLAG on partition
no third thing needed
2014-07-28 18:40:02 -05:00
Daniel Wallace
003fe8d144 closes #14560 2014-07-28 18:38:34 -05:00
Daniel Wallace
273dd411a4 closes #14557 2014-07-28 18:38:09 -05:00
Daniel Wallace
37470d81b4 closes #14558 2014-07-28 18:36:55 -05:00
Daniel Wallace
bbf0082017 closes #14556 2014-07-28 18:36:30 -05:00
Daniel Wallace
0a635d9ecd closes #14565 2014-07-28 18:34:54 -05:00
Daniel Wallace
baf74a5d7b closes #14564 2014-07-28 18:30:46 -05:00
Daniel Wallace
fdde21a1fb closes #14566 2014-07-28 18:30:41 -05:00
Pedro Algarvio
48b5a31703 Update to latest, v2014.07.27 bootstrap script.
* Amazon Linux AMI 2010.xx is now explicitly not supported.
* Install the `salt-api` scripts if available when the `salt-master` is also installed.
* Added support for a configurable sleep time when starting, restarting and checking
  for enabled services.
* Drop the `tsflags` requirement for RHEL and RHEL based distributions.
* When sorting release files, oracle-release has higher priority than redhat-release.
* Distro Support Fixed:
  * Debian >= 7 uses system's python-requests package, not PIP
  * Install 'python-zypp' in SuSE and openSUSE(required by Salt's zypper module)
  * Only install EPEL on requiring distributions if not already installed
  * CentOS 7 now uses systemd and the script now properly handles it
  * systemd in openSUSE 12.2 complains if service does not contain `.service``
  * Properly detect openSUSE using `lsb_release
  * SLES 11 SP3 ships with both python-M2Crypto-0.22.* and python-m2crypto-0.21 and we
    will be asked which we want to install, even with --non-interactive. Let's try to
    install the higher version first and then the lower one in case of failure.
  * Allow some extra time on RHEL for the optionals repo check in case the repository
    subscription is being managed externally.
2014-07-28 17:44:36 +01:00
Mathieu Le Marec - Pasquet
4e1e150025 aptpkg: restore support for lenny... 2014-07-28 12:30:56 +02:00
Erik Johnson
1858114027 Merge pull request #14541 from garethgreenaway/14530_ipv6_only_broken
Fixing debian_ip.py per #14530.
2014-07-27 21:53:39 -05:00
Gareth J. Greenaway
417c0740bc Fixing debian_ip.py per #14530. 2014-07-27 18:07:45 -07:00
Erik Johnson
d21af7c8b6 Merge pull request #14534 from garethgreenaway/2014.7_14426_apt_virtual_pkg
Switching the _get_virtual function to use pure python instead of a call to grep-available
2014-07-26 19:16:57 -05:00
Gareth J. Greenaway
d73c76e847 Switching the _get_virtual function to use pure python instead of a call to grep-available. 2014-07-26 17:13:08 -07:00
Thomas S Hatch
a9875fc6f7 Merge pull request #14524 from whiteinge/doc-hashutil
Add docs for the hashutil module
2014-07-25 21:52:57 -06:00
Seth House
3164b2164e Added hashutil module to docs index 2014-07-25 20:06:54 -06:00
Seth House
60e4de3fdd Removed hashutils functions without tests 2014-07-25 19:59:30 -06:00
Thomas S Hatch
0cd1236108 Merge pull request #14508 from whiteinge/salt-jinja-utils
Added utils module for working with hash functions
2014-07-25 18:48:49 -06:00
Seth House
adabf74852 Added utils module for working with hash functions 2014-07-25 16:12:37 -06:00
Thomas S Hatch
6e575491ee Merge pull request #14506 from whiteinge/netapi-client-config
Load netapi modules using client config instead of master config
2014-07-25 15:49:02 -06:00