Commit Graph

67072 Commits

Author SHA1 Message Date
Justin Findlay
b71864d76d modules.parallels.exec: run a command on a VM 2016-04-02 16:42:00 -06:00
Justin Findlay
0bedcc74c0 modules.parallels: accept {} as part of GUID 2016-04-02 12:05:20 -06:00
Justin Findlay
6f82dac50f modules.parallels: clearly associate snapshot IDs, names 2016-04-02 12:05:20 -06:00
Justin Findlay
35f6e99c07 modules.parallels: add strict option to snapshot ID/name convert 2016-04-02 12:05:20 -06:00
Justin Findlay
12614b726e modules.parallels: use snapshot name where possible
GUIDs are not safe for human consumption.
2016-04-02 12:05:20 -06:00
Justin Findlay
2cd29048a4 modules.parallels: do not silent fail on snap ID/name convert 2016-04-02 12:05:20 -06:00
Justin Findlay
4fe66eeed4 modules.parallels: rename id to snap_id 2016-04-02 12:05:20 -06:00
Justin Findlay
af62e5ba4b modules.parallels: rename snapshot to snap_name 2016-04-02 12:05:20 -06:00
Justin Findlay
93836d9f6b modules.parallels: add utils to convert between snapshot id, name 2016-04-02 12:05:18 -06:00
Justin Findlay
ff08470cbe modules.parallels.list_vms: paramaterize --all 2016-04-02 12:04:44 -06:00
Justin Findlay
56e94af4aa modules.parallels: add runas support 2016-04-02 12:04:43 -06:00
Justin Findlay
4ab2bb718a add modules.parallels
Execution module for interacting with Parallels Desktop
2016-04-02 12:04:41 -06:00
Justin Anderson
d6c673847e Merge pull request #32308 from terminalmage/fix-buildpackage-spec
Update buildpackage spec
2016-04-01 17:13:53 -06:00
Erik Johnson
29723182f9 Update buildpackage spec 2016-04-01 17:57:42 -05:00
Nicole Thomas
9fa6ea0cfe Merge pull request #32303 from terminalmage/fix-missing-release-2016.3
Properly support packages with blank "Release" param in pkg.latest_version (2016.3 branch)
2016-04-01 16:13:09 -06:00
Erik Johnson
d50815a300 Properly support packages with blank "Release" param in pkg.latest_version 2016-04-01 16:10:11 -05:00
Nicole Thomas
7ae89b0562 Merge pull request #32277 from alprs/doc-batch_wait
Documentation for --batch-wait
2016-04-01 10:20:52 -06:00
Andreas Lutro
1d50edd8e9 add versionadded 2016-04-01 18:18:54 +02:00
Andreas Lutro
7e620d5ee1 add documentation for --batch-wait 2016-03-31 19:58:11 +02:00
Nicole Thomas
ff3c63c4ce Merge pull request #32275 from cro/doc_32252
Documentation updates to go with PR #32252
2016-03-31 11:01:01 -06:00
C. R. Oldham
7abf8becaa Documentation updates that go with PR #32252. 2016-03-31 10:41:24 -06:00
Mike Place
a0221b54bc Merge pull request #32269 from s0undt3ch/2016.3
Properly handle signals
2016-03-31 09:29:29 -06:00
Nicole Thomas
9c1b2a43a9 Merge pull request #32252 from cro/proxy_grains_fixes
Make grains for proxies work (though differently than the rest of Salt)
2016-03-31 08:53:53 -06:00
Mike Place
8ca6bf2177 Merge pull request #32259 from jfindlay/tmpdir
MacOS tmpdir
2016-03-31 08:31:07 -06:00
Pedro Algarvio
2e54936847
Properly handle signals 2016-03-31 13:08:31 +01:00
Justin Findlay
8f558a5f41 tests...runtests_helpers: TMPDIR on MacOS gives too long paths 2016-03-30 21:09:40 -06:00
Justin Findlay
0edd532add tests.integration: TMPDIR on MacOS gives too long paths 2016-03-30 21:09:39 -06:00
Justin Findlay
c74c241831 tests.integration: use os.path.realpath
This reverts bf894c37, 6b99798b, and 4028d80e.  `os.path.realpath`
behaves identically to `salt.utils.abs_readlink` on the doc tests in
that function.
2016-03-30 21:09:39 -06:00
C. R. Oldham
e1b4093dfd Remove comment (it was in the wrong place). 2016-03-30 20:11:20 -06:00
Nicole Thomas
94c58f072a Merge pull request #32251 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-03-30 18:03:02 -06:00
rallytime
ea3d21d126 Fix failing test 2016-03-30 16:53:42 -06:00
rallytime
3a0987c7c1 Pylint fix 2016-03-30 16:05:03 -06:00
C. R. Oldham
d4315aa902 Make grains for proxies work (though it is differently than the rest of Salt due to the way grains have to be loaded). Also remove unused 'enumerate_proxy' config variable. 2016-03-30 15:46:30 -06:00
rallytime
fa5e17b342 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/win_service.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
2016-03-30 15:33:13 -06:00
Nicole Thomas
0f5e67de5d Merge pull request #32248 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-03-30 15:10:01 -06:00
Nicole Thomas
6216c37885 Merge pull request #32230 from terminalmage/issue32169
systemd.py: Support both update-rc.d and chkconfig as managers of sysv services
2016-03-30 15:09:43 -06:00
jacobhammons
bde2a1fc98 Merge pull request #32249 from jacobhammons/dot8
Fixes windows download paths to account for patch
2016-03-30 14:26:53 -06:00
Jacob Hammons
50d1df2482 Fixes windows download paths to account for patch 2016-03-30 14:26:03 -06:00
rallytime
d743f8cc4e Merge branch '2015.5' into '2015.8'
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/modules/aptpkg.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
2016-03-30 13:38:38 -06:00
Erik Johnson
45af3e902a systemd.py: Support both update-rc.d and chkconfig as managers of sysv services
Fixes #32169
2016-03-30 14:28:53 -05:00
Mike Place
4a5d1b1dd3 Merge pull request #31768 from twangboy/mac_xattr_int
Integration Tests for mac_xattr.py
2016-03-30 13:03:25 -06:00
Mike Place
2816982178 Merge pull request #31959 from twangboy/mac_timezone_int
Integration tests for mac_timezone.py
2016-03-30 13:03:15 -06:00
Mike Place
50e34574d7 Merge pull request #31840 from twangboy/mac_shadow_int
Integration tests for mac_shadow
2016-03-30 13:02:44 -06:00
twangboy
ae61fa4851 Fix documentation
Fixed errorneous return type for _get_account_policy
Added documentation for unsupported functions
2016-03-30 12:56:39 -06:00
twangboy
8d5cd010cc Add more descriptive documentation for errors 2016-03-30 12:56:39 -06:00
twangboy
d900e17f4e Fix _set_account_policy function 2016-03-30 12:56:39 -06:00
twangboy
86d9dc21b7 Fix get_login_failed_count function 2016-03-30 12:56:39 -06:00
twangboy
a273fa041c Fix User not found detection 2016-03-30 12:56:39 -06:00
twangboy
6ebdf89e4d Syntax Error and Lint 2016-03-30 12:56:39 -06:00
twangboy
7302084a12 Added documentation about raise error
Refactored
2016-03-30 12:56:39 -06:00