JP Viljoen
|
6f3a1ab7b3
|
[docs] fix minor typo
|
2014-12-07 10:24:49 +02:00 |
|
Joseph Hall
|
4ffaf494a7
|
Merge pull request #18758 from rallytime/runner_jobs_docs
Add docs to runner.jobs.lookup_jid and versionadded tags
|
2014-12-06 21:04:30 -07:00 |
|
Colton Myers
|
9da47116af
|
Merge pull request #18769 from basepi/salt-ssh-state.single-versionadded
Add versionadded for state.single wrapper for salt-ssh
|
2014-12-05 13:02:39 -07:00 |
|
Colton Myers
|
b2d3dd2f3e
|
Add versionadded for state.single wrapper for salt-ssh
|
2014-12-05 13:01:58 -07:00 |
|
Colton Myers
|
45285258ce
|
Merge pull request #18766 from basepi/file.copy-versionadded
Add missing versionadded directives for file.copy state
|
2014-12-05 10:51:09 -07:00 |
|
Colton Myers
|
9ae94dd771
|
Add missing versionadded directives for file.copy state
|
2014-12-05 10:50:41 -07:00 |
|
Joseph Hall
|
b0fdddc496
|
Merge pull request #18761 from rallytime/whitespace
Whitespace fix
|
2014-12-04 20:02:44 -07:00 |
|
rallytime
|
37354f1a81
|
Whitespace fix
|
2014-12-04 19:59:54 -07:00 |
|
rallytime
|
da317e2922
|
Add docs to runner.jobs.lookup_jid and versionadded tags
Fixes #18755
|
2014-12-04 17:10:54 -07:00 |
|
Thomas S Hatch
|
2a44137419
|
Merge pull request #18746 from basepi/saltssh-state.single-7903
Implement state.single wrapper for salt-ssh
|
2014-12-04 16:51:04 -07:00 |
|
Thomas S Hatch
|
d4ae243b17
|
Merge pull request #18738 from SmithSamuelM/sam_20141204
Fixed bugs in raetlane.py. Added changes to transport
|
2014-12-04 16:49:02 -07:00 |
|
Thomas S Hatch
|
7e5748e518
|
Merge pull request #18726 from rallytime/pip_version_added
Add versionadded tags to new pip module and state functions
|
2014-12-04 16:48:21 -07:00 |
|
Thomas S Hatch
|
9262eacfe2
|
Merge pull request #18724 from jacksontj/develop
More Sreq cleanup
|
2014-12-04 16:48:06 -07:00 |
|
Thomas S Hatch
|
683987e4c3
|
Merge pull request #18715 from styro/new-windows-deps
Add some new Windows build dependencies to docs.
|
2014-12-04 16:46:02 -07:00 |
|
Thomas S Hatch
|
f8b824f87a
|
Merge pull request #18712 from styro/fix-missing-csv
Explicitly include stdlib csv module in esky build. Fixes missing csv mo...
|
2014-12-04 16:44:51 -07:00 |
|
Thomas S Hatch
|
4bd24e8350
|
Merge pull request #18709 from leeNicks/patch-1
Update postgres.py
|
2014-12-04 16:44:14 -07:00 |
|
Thomas S Hatch
|
e9d91a2162
|
Merge pull request #18708 from jeffrey4l/fix_gitfs_log
stop log error when the gitfs verify all possible backends
|
2014-12-04 16:43:53 -07:00 |
|
Thomas S Hatch
|
4451ae2bca
|
Merge pull request #18706 from elvis-macak/develop
fix the salt.utils.expr_match
|
2014-12-04 16:42:48 -07:00 |
|
Thomas S Hatch
|
fc8535e09f
|
Merge pull request #18702 from wolfpackmars2/patch-1
Propose update to master config file
|
2014-12-04 16:41:43 -07:00 |
|
Thomas S Hatch
|
e9d5a3d0d3
|
Merge pull request #18696 from lyft/no-grain-sync-when-local
Do not sync grains in grains.setval when using local mode
|
2014-12-04 16:40:49 -07:00 |
|
Thomas S Hatch
|
136054efc4
|
Merge pull request #18687 from mkotzev/develop
Support multiple roots per environment for external pillars S3 and Git
|
2014-12-04 16:39:41 -07:00 |
|
Thomas S Hatch
|
aaa128fea0
|
Merge pull request #18683 from cachedout/issue_17190
Catch common error in salt.function and warn and correct
|
2014-12-04 16:38:58 -07:00 |
|
Thomas S Hatch
|
458b243738
|
Merge pull request #18681 from nitti/fix-rh_ip-mtu
properly set MTU in network interface configuration files for RHEL-based distributions.
|
2014-12-04 16:38:14 -07:00 |
|
Thomas S Hatch
|
f958bb9c7b
|
Merge pull request #18748 from dmyerscough/drac-runner-recommendations
Cleaning code #18699
|
2014-12-04 15:53:53 -07:00 |
|
Samuel M Smith
|
076c129390
|
Fix lint errors
|
2014-12-04 15:51:12 -07:00 |
|
Samuel M Smith
|
9988deb132
|
Merge remote-tracking branch 'upstream/develop' into sam_20141204
|
2014-12-04 15:40:16 -07:00 |
|
Samuel M Smith
|
387a51bd1e
|
Merge remote-tracking branch 'upstream/develop' into sam_20141204
Conflicts:
salt/transport/__init__.py
|
2014-12-04 15:40:05 -07:00 |
|
Thomas S Hatch
|
22fa1ffcbe
|
add comment so we don't take it back out
|
2014-12-04 15:37:41 -07:00 |
|
Thomas S Hatch
|
97b61f6b80
|
put this back, we need to pylint disable this line
|
2014-12-04 15:36:50 -07:00 |
|
Joseph Hall
|
98ab6a67cf
|
Merge pull request #18750 from rallytime/core_grains
Use python functions instead of shell pipes
|
2014-12-04 15:30:08 -07:00 |
|
rallytime
|
c4047cae2f
|
Use python functions instead of shell pipes
|
2014-12-04 14:58:57 -07:00 |
|
Thomas S Hatch
|
c06e4fc010
|
revert #18690
|
2014-12-04 14:52:43 -07:00 |
|
Colton Myers
|
11ff94ac9a
|
Merge pull request #18730 from nmadhok/zfs-module
Adding more module functions to salt.modules.zfs
|
2014-12-04 14:45:12 -07:00 |
|
Colton Myers
|
cf16608a81
|
Merge pull request #18749 from basepi/lithium-saltssh-release
Add state.single to salt-ssh release notes for lithium
|
2014-12-04 14:36:14 -07:00 |
|
Colton Myers
|
79e5e80ad1
|
Add state.single to salt-ssh release notes for lithium
|
2014-12-04 14:35:52 -07:00 |
|
Damian Myerscough
|
cb47026ab5
|
Cleaning code #18699
|
2014-12-04 13:25:03 -08:00 |
|
Colton Myers
|
dfc1fe87c2
|
Pull more from state.sls wrapper
|
2014-12-04 14:14:07 -07:00 |
|
Colton Myers
|
581d2ba5c1
|
Get SSHState from the correct location
|
2014-12-04 14:12:06 -07:00 |
|
Colton Myers
|
b19ec2ef7a
|
Fix some copy pasta
|
2014-12-04 14:10:21 -07:00 |
|
Colton Myers
|
45106823d6
|
Add state.single wrapper func for salt-ssh
Ref #7903
|
2014-12-04 13:44:25 -07:00 |
|
Thomas S Hatch
|
3a50001a7f
|
Merge pull request #18740 from saltstack/revert-18643-develop
Revert "Channel/Sreq cleanup"
|
2014-12-04 13:26:11 -07:00 |
|
Thomas S Hatch
|
59f16926e9
|
Revert "Channel/Sreq cleanup"
|
2014-12-04 13:26:04 -07:00 |
|
Thomas Jackson
|
50c3766a28
|
More Sreq cleanup
Changing the local variable names in the last few places to be consistent
|
2014-12-04 12:00:54 -08:00 |
|
Nicole Thomas
|
b9ef32979e
|
Merge pull request #18735 from rallytime/whitespace_fix
Whitespace fix
|
2014-12-04 12:35:54 -07:00 |
|
Nicole Thomas
|
bf8276c2ea
|
Merge pull request #18732 from basepi/merge-forward
Merge forward from 2014.7 to develop
|
2014-12-04 12:34:53 -07:00 |
|
Nitin Madhok
|
f2b56c5364
|
Adding force option to salt.modules.zfs.destroy
|
2014-12-04 14:20:16 -05:00 |
|
Nitin Madhok
|
f6fea1fc24
|
Adding salt.modules.zfs.destroy to destroy zfs file system
|
2014-12-04 14:14:49 -05:00 |
|
rallytime
|
36510d4f3c
|
Whitespace fix
|
2014-12-04 12:03:34 -07:00 |
|
Nitin Madhok
|
0b014ae6d4
|
Fixing return login in zpool.destroy
|
2014-12-04 13:55:19 -05:00 |
|
Nitin Madhok
|
fe544482e5
|
Aditing create_parent option to salt.modules.zfs.create
|
2014-12-04 13:41:38 -05:00 |
|