Thomas S Hatch
|
bcb529f809
|
Merge pull request #18823 from scalp42/typos
Correct some typos
|
2014-12-09 14:43:15 -07:00 |
|
Thomas S Hatch
|
1e9a9aa2fc
|
Merge pull request #18807 from hulu/develop
fix for #18778 (salt-ssh tries to copy file to the filesystem root)
|
2014-12-09 14:37:28 -07:00 |
|
Thomas S Hatch
|
0cf71ddfb0
|
lint
|
2014-12-09 14:31:25 -07:00 |
|
Thomas S Hatch
|
655d067cf8
|
Merge pull request #18764 from jacksontj/develop
Channel/Sreq cleanup
|
2014-12-09 14:30:22 -07:00 |
|
Colton Myers
|
739d942a18
|
Merge pull request #18810 from nmadhok/patch-1
Fixing bug in salt.modules.zfs.list error return
|
2014-12-09 14:08:23 -07:00 |
|
Colton Myers
|
4aa0f47303
|
Merge pull request #18846 from basepi/servicemodwatchargs
Add **kwargs to service.mod_watch
|
2014-12-09 13:55:35 -07:00 |
|
Pedro Algarvio
|
e5dc9f5b28
|
Merge pull request #18849 from techhat/ec2win
Copy fixes for Windows Salt Cloud doc
|
2014-12-09 19:03:20 +00:00 |
|
Joseph Hall
|
25d8cb6560
|
Copy fixes for Windows Salt Cloud doc
|
2014-12-09 11:57:35 -07:00 |
|
Thomas S Hatch
|
274aca9b5b
|
Merge pull request #18844 from rallytime/fix_parted_tests
Patch unittests when calling _validate_device
|
2014-12-09 11:46:58 -07:00 |
|
Colton Myers
|
08d4cbdbe3
|
Add **kwargs to service.mod_watch
Gets rid of warnings about `enable` and `__reqs__` not being supported
by the function
|
2014-12-09 11:13:16 -07:00 |
|
Thomas S Hatch
|
3d73816507
|
Merge branch '2014.7' into develop
Conflicts:
salt/modules/virtualenv_mod.py
salt/states/network.py
salt/utils/parsers.py
|
2014-12-09 10:59:18 -07:00 |
|
Thomas S Hatch
|
37b3e48d13
|
Merge pull request #18838 from rallytime/fix_archive_tests
Fix mocked calls in unit/modules/archive_test.py
|
2014-12-09 10:55:49 -07:00 |
|
Thomas S Hatch
|
6368bef4e1
|
Merge pull request #18845 from thatch45/bootstrap_paths
Add more paths to syspaths
|
2014-12-09 10:55:36 -07:00 |
|
Thomas S Hatch
|
2fad613c6f
|
Add more paths to syspaths
|
2014-12-09 10:54:38 -07:00 |
|
rallytime
|
8211dc2f00
|
Patch unittests when calling _validate_device
|
2014-12-09 10:48:02 -07:00 |
|
Thomas Jackson
|
d9572d85af
|
Add required funcs to the baseclass
|
2014-12-09 08:39:46 -08:00 |
|
Thomas Jackson
|
3186e246c6
|
Clean up the logic
|
2014-12-09 08:37:03 -08:00 |
|
Thomas Jackson
|
865c66d583
|
Add missing import
We use it in the ZMQChannel, I'm not sure how this works without the import
|
2014-12-09 07:55:56 -08:00 |
|
Nicole Thomas
|
48e1df7bee
|
Merge pull request #18776 from jfindlay/quote_virtualenv
unquote venv mod commands
|
2014-12-09 08:50:32 -07:00 |
|
Thomas Jackson
|
85b4512164
|
Pylint fix
|
2014-12-09 07:41:57 -08:00 |
|
Thomas Jackson
|
77d8332d59
|
Convert wheel to channel interface as well
|
2014-12-09 07:41:57 -08:00 |
|
Thomas Jackson
|
7ed0138207
|
Convert saltutil to use channel instead of sreq
|
2014-12-09 07:41:57 -08:00 |
|
Thomas Jackson
|
2562b4cc31
|
Cleanup names, this is now a channel, not an sreq
|
2014-12-09 07:41:57 -08:00 |
|
rallytime
|
db9ae406c3
|
Fix mocked calls in unit/modules/archive_test.py
This is due to the changes in #18621
|
2014-12-09 08:36:30 -07:00 |
|
Justin Findlay
|
b7467f5f45
|
update venv unit tests accordingly
|
2014-12-08 23:28:28 -07:00 |
|
Justin Findlay
|
61e92c46ce
|
unquote venv mod commands
|
2014-12-08 23:01:08 -07:00 |
|
Nicole Thomas
|
e0b2110fee
|
Merge pull request #18820 from rallytime/whitespace_fixing
Whitespace fix
|
2014-12-08 16:36:24 -07:00 |
|
Anthony Scalisi
|
55d1da42d3
|
fix typo in spec
|
2014-12-08 14:34:02 -08:00 |
|
Anthony Scalisi
|
5262424c5b
|
fix typo in gem module doc
|
2014-12-08 14:33:31 -08:00 |
|
Anthony Scalisi
|
44963fae0e
|
fix various typos
|
2014-12-08 14:32:53 -08:00 |
|
rallytime
|
141c0003da
|
Whitespace fix
|
2014-12-08 15:16:44 -07:00 |
|
Thomas S Hatch
|
8a8d8883c6
|
Merge pull request #18816 from lyft/six-to-2014-7
Add salt.ext.six to 2014.7 for module backwards compat from develop
|
2014-12-08 15:08:39 -07:00 |
|
Thomas S Hatch
|
ac08c08695
|
Merge pull request #18815 from techhat/ec2win
Allow userdata to be passed to EC2
|
2014-12-08 15:07:38 -07:00 |
|
Ryan Lane
|
70f6ed86f6
|
Add salt.ext.six to 2014.7 for module backwards compat from develop
|
2014-12-08 13:32:53 -08:00 |
|
Joseph Hall
|
790cd28ff1
|
Update Windows docs for auto-generated Windows passwords
|
2014-12-08 14:23:05 -07:00 |
|
Nitin Madhok
|
9e28d82a9a
|
Better error handling for salt.modules.zfs.list
|
2014-12-08 16:02:55 -05:00 |
|
Joseph Hall
|
8ec9ab937d
|
Allow userdata to be passed to EC2
|
2014-12-08 13:54:25 -07:00 |
|
Nicole Thomas
|
76db5fdfe0
|
Merge pull request #18798 from s0undt3ch/2014.7
Make coverage reports optional
|
2014-12-08 13:40:14 -07:00 |
|
Nitin Madhok
|
94872177d8
|
Fixing bug in salt.modules.zfs.list error return
|
2014-12-08 15:28:57 -05:00 |
|
Thomas S Hatch
|
521cb2f82a
|
Merge pull request #18804 from garethgreenaway/12178_debian_briding
fixes to debian_ip.py
|
2014-12-08 13:27:24 -07:00 |
|
Thomas S Hatch
|
ffc2112470
|
Merge pull request #18803 from nmadhok/zfs-module-list
Adding properties option to salt.modules.zfs.list
|
2014-12-08 13:26:18 -07:00 |
|
Thomas S Hatch
|
68ef541ae2
|
Merge pull request #18795 from sjlu/develop
Better explanation of identity in salt.states.git
|
2014-12-08 13:23:33 -07:00 |
|
Thomas S Hatch
|
7dd99fbd91
|
Merge pull request #18794 from nmadhok/doc-fixes
Doc fixes
|
2014-12-08 13:22:39 -07:00 |
|
Thomas S Hatch
|
454bd83479
|
Merge pull request #18788 from sjansen/patch-3
Restore salt-cloud ssh_gateway support
|
2014-12-08 13:21:28 -07:00 |
|
Thomas S Hatch
|
0c6655544c
|
Merge pull request #18782 from rallytime/master_tops_rendering
Fix markup so master_tops document will render correctly
|
2014-12-08 13:21:00 -07:00 |
|
Thomas S Hatch
|
989a11f147
|
Merge pull request #18780 from rallytime/pymongo_note
Add pymongo requirement notification to mongodb_user state
|
2014-12-08 13:18:11 -07:00 |
|
Thomas S Hatch
|
d0b3b05dcf
|
Merge pull request #18771 from rallytime/list_not_tuple
Use a list instead of a tuple when running dpkg-query command
|
2014-12-08 13:16:27 -07:00 |
|
Thomas S Hatch
|
99306e850b
|
Merge pull request #18768 from basepi/merge-forward
Merge forward from 2014.7 to develop
|
2014-12-08 13:11:54 -07:00 |
|
Thomas S Hatch
|
a47aa7be76
|
Merge pull request #18765 from pass-by-value/api_tokens
Accept salt token for cherrypy /events
|
2014-12-08 13:11:43 -07:00 |
|
Thomas S Hatch
|
589ce8f981
|
Merge pull request #18767 from garethgreenaway/18474_2014_7_not_updating_fstab
Fixes to mount state.
|
2014-12-08 13:11:23 -07:00 |
|