Commit Graph

43122 Commits

Author SHA1 Message Date
Rupesh Tare
c86bdb6c16 created unit test case for function atq from module at 2014-12-12 19:23:22 +05:30
Nicole Thomas
e0b2110fee Merge pull request #18820 from rallytime/whitespace_fixing
Whitespace fix
2014-12-08 16:36:24 -07:00
rallytime
141c0003da Whitespace fix 2014-12-08 15:16:44 -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
Joseph Hall
790cd28ff1 Update Windows docs for auto-generated Windows passwords 2014-12-08 14:23:05 -07:00
Joseph Hall
8ec9ab937d Allow userdata to be passed to EC2 2014-12-08 13:54:25 -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
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
1046e3e309 Merge pull request #18727 from vladislav-jomedia/develop
If the elb does not exist in the region provided, don't return True
2014-12-08 13:07:51 -07:00
Thomas S Hatch
a2d0b36fac Merge pull request #18711 from Lacrymology/mongodb-insert-remove
Mongodb add find, and fix insert return value
2014-12-08 13:07:08 -07:00
Nitin Madhok
612d3f1c30 Removing trailing whitespaces 2014-12-08 14:42:49 -05:00
Nitin Madhok
e365753dda Adding properties option to salt.modules.zpool.list 2014-12-08 14:09:49 -05:00
Nitin Madhok
07b4b4a688 Readding orchestrate tutorial links 2014-12-08 12:56:05 -05:00
Colton Myers
9525e2131e Merge pull request #18790 from nmadhok/zfs-module-additions
salt.modules.zfs module function additions
2014-12-08 10:33:24 -07:00
Nitin Madhok
325e948406 Removing broken links 2014-12-08 12:12:41 -05:00
Steven Lu
88db462bfb Better explanation of identity in salt.states.git 2014-12-08 11:23:27 -05:00
Nitin Madhok
d2685b8fa2 Fixing sphinx errors 2014-12-08 11:18:12 -05:00
Nitin Madhok
c299f4119a Adding pillar to toctree 2014-12-08 10:52:38 -05:00
Nitin Madhok
f168af05ef Adding state to toctree 2014-12-08 10:50:09 -05:00
Nitin Madhok
62bbca74ca Merge branch 'develop' of https://github.com/saltstack/salt into doc-fixes 2014-12-08 10:44:24 -05:00
Joseph Hall
9dbe6b4f80 Merge pull request #18793 from nmadhok/doc-fixes
Doc fixes
2014-12-08 08:38:53 -07:00
Nitin Madhok
67fd828708 Adding modules to toctree 2014-12-08 10:34:33 -05:00
Nitin Madhok
813d1a059e Changing python code-block to text 2014-12-08 10:30:35 -05:00
Nitin Madhok
d030865253 Move note inside salt.modules.list above CLI Example 2014-12-08 10:17:58 -05:00
Nitin Madhok
c6c9529c66 Fixing broken link to list function 2014-12-08 10:00:10 -05:00
Nitin Madhok
690f66f7fb Adding code author name and email 2014-12-08 09:54:47 -05:00
Nitin Madhok
35d385374a Lint fixes 2014-12-08 06:29:32 -05:00
Nitin Madhok
46370cb6d6 Adding ability in salt.modules.zfs.list to recursivel display information about descendent datasets of the specified dataset 2014-12-08 06:14:13 -05:00
Nitin Madhok
25fe04df9b Adding ability in salt.modules.zfs.list to list a specified dataset and values of its properties 2014-12-08 05:48:44 -05:00
Nitin Madhok
bbca945fd2 Adding salt.modules.zfs.list to list all datasets present on the file system and values of their properties 2014-12-08 05:38:52 -05:00
Nitin Madhok
d3f712ab3c Adding salt.modules.zfs.rename to rename or relocate zfs file system 2014-12-08 05:36:01 -05:00
Stuart Jansen
da1eaf2f2e Restore salt-cloud ssh_gateway support 2014-12-07 17:16:06 -07:00
Joseph Hall
a5c5b33cf1 Merge pull request #18786 from froztbyte/develop
[docs] fix minor typo
2014-12-07 05:07:27 -07:00
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
vladislav-jomedia
c89ee601de Update boto_elb.py 2014-12-06 17:38:44 -05: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
Aditya Kulkarni
d389bfd786 Fix pylint warning 2014-12-05 14:01:26 -05:00
Colton Myers
7b83d22032 Merge branch '2014.7' into merge-forward
Conflicts:
	salt/client/ssh/wrapper/state.py
	salt/config.py
	salt/utils/event.py
2014-12-05 11:01:02 -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
Aditya Kulkarni
e19550763b Accept salt token for cherrypy /events 2014-12-05 12:15:23 -05: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
Tomas Neme
2f1feeabfc pep8 2014-12-05 10:47:37 +08:00