Pedro Algarvio
7a77942a82
Add another example for version comparison
2014-07-30 18:10:16 +01:00
Pedro Algarvio
fc239f8cd9
Add another version example to the tests
2014-07-30 18:10:09 +01:00
Pedro Algarvio
827ccd5338
Support a minor bugfix attribute in the version string
2014-07-30 18:10:02 +01:00
Pedro Algarvio
406891427a
Switch ??? for n/a
2014-07-30 18:09:57 +01:00
Pedro Algarvio
4ece94057f
Stop hard coding the version name.
...
Fixes saltstack/backlog/issues#11
2014-07-30 18:09:51 +01:00
Pedro Algarvio
90bb1969f0
Version names only contain major and minor parts of the version
2014-07-30 18:09:45 +01:00
Pedro Algarvio
0467bdd1cb
Show "Enterprise" instead of "SSE"
...
Fixes saltstack/backlog#33
2014-07-30 18:09:39 +01:00
Pedro Algarvio
d71e33fb05
Report SSE on formatted version
2014-07-30 18:09:32 +01:00
Pedro Algarvio
996d8ec76b
Add boolean property to differentiate SSE
2014-07-30 18:09:24 +01:00
Gareth J. Greenaway
47099a9d2d
Fixing a reported issue when using file.append to append strings to a file when the string contains an equal sign. Also added the fix to file.prepend and file.write.
2014-07-30 10:01:09 -07:00
Thomas Orozco
08a8a8cee8
Add a Debian init script for salt-api
2014-07-30 17:53:05 +02:00
Nicole Thomas
4523a0efef
Merge pull request #14636 from rallytime/pylint_fix
...
Fix trailing whitepsace
2014-07-30 08:51:41 -06:00
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
Mike Place
7500e82e46
Align tmpdir and deploy dir
2014-07-29 13:12:39 -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
be605bc81a
Use local bootstrap
...
Conflicts:
salt/modules/config.py
salt/modules/seed.py
2014-07-29 11:03:20 -06:00
Mike Place
785bebe0f8
Remove unusued testing code
2014-07-29 10:54:13 -06:00
Mike Place
985b3d0c09
Correct path
...
Conflicts:
salt/client/ssh/__init__.py
2014-07-29 10:54:08 -06:00
Mike Place
5f7a9d98ec
Randomize salt cloud deployment directory
...
Conflicts:
salt/utils/cloud.py
2014-07-29 10:51:49 -06: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
