Commit Graph

46868 Commits

Author SHA1 Message Date
Justin Findlay
64d7e86b54 Merge pull request #22507 from twangboy/release_notes
Added additional details regarding windows implementation
2015-04-09 13:43:29 -06:00
shanedlee
c874ca8c20 Added additional details regarding windows implementation 2015-04-09 11:32:13 -04:00
Justin Findlay
5c73b1ceb7 Merge pull request #22500 from rahulhan/states_hg_unit_test
Adding states/hg.py unit test cases
2015-04-09 09:07:11 -06:00
Justin Findlay
25903258b2 Merge pull request #22496 from rahulhan/states_host_unit_test
Adding states/host.py unit test cases
2015-04-09 09:06:49 -06:00
Justin Findlay
b232a73db7 Merge pull request #22504 from jayeshka/serverdensity_device-unit-test
adding serverdensity_device unit test case.
2015-04-09 09:06:25 -06:00
Justin Findlay
ae55fb4824 Merge pull request #22499 from rahulhan/states_http_unit_test
Adding states/http.py unit test cases
2015-04-09 07:17:29 -06:00
Justin Findlay
738fb1c4b6 Merge pull request #22495 from rahulhan/win_service_unit_test
Adding win_service.py unit test cases
2015-04-09 07:15:37 -06:00
Jayesh Kariya
8afff0f337 adding serverdensity_device unit test case. 2015-04-09 17:29:48 +05:30
Rahul Handay
2a6073dde5 Adding states/hg.py unit test cases 2015-04-09 15:44:22 +05:30
Rahul Handay
80bf9e8734 Adding states/http.py unit test cases 2015-04-09 15:42:01 +05:30
Rahul Handay
65adbce5e7 Adding states/host.py unit test cases 2015-04-09 13:02:15 +05:30
Rahul Handay
0b28284b7d Adding win_service.py unit test cases 2015-04-09 12:31:51 +05:30
Justin Findlay
654f5c58bd Merge pull request #22488 from ckochenower/2015.2
Fix cassandra_cql execution module documentation/examples
2015-04-08 22:45:49 -06:00
Corin Kochenower
21435834d0 Fix cassandra_cql execution module documentation/examples 2015-04-08 20:10:50 -06:00
Nicole Thomas
595051aa0c Merge pull request #22468 from basepi/merge-forward-2015.2
[2015.2] Merge forward from 2014.7 to 2015.2
2015-04-08 16:58:37 -06:00
Nicole Thomas
9f5a414761 Merge pull request #22443 from garethgreenaway/2015_2_fix_runner_doc
Fixes to sysmod.py
2015-04-08 16:57:07 -06:00
Thomas S Hatch
d5cbabc37d Merge pull request #22441 from cro/missing_patch
Throw better error if no patch exec found
2015-04-08 13:05:29 -06:00
Colton Myers
5f1a4b45b8 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-08 10:38:34 -06:00
Justin Findlay
ad7b066dce Merge pull request #22455 from jayeshka/grains-unit-test
adding states/grains unit test case.
2015-04-08 09:05:30 -06:00
Nicole Thomas
f8d81dde1e Merge pull request #22459 from jayeshka/smtp_states-unit-test
adding states/smtp unit test case.
2015-04-08 08:45:27 -06:00
Nicole Thomas
2fd7b8c3b2 Merge pull request #22457 from jayeshka/sysctl-unit-test
adding states/sysctl unit test case.
2015-04-08 08:43:06 -06:00
Nicole Thomas
fa14bd128e Merge pull request #22456 from rahulhan/states_svn_unit_test
Adding states svn.py unit test cases
2015-04-08 08:42:19 -06:00
Nicole Thomas
0b3baec866 Merge pull request #22454 from rahulhan/win_repo_unit_test
Adding win_repo.py unit test cases
2015-04-08 08:38:05 -06:00
Jayesh Kariya
481e2e4ad0 adding states/smtp unit test case. 2015-04-08 17:54:52 +05:30
Jayesh Kariya
5a016c5eda cosmetic change 2015-04-08 17:49:38 +05:30
Jayesh Kariya
705c387368 doc string change. 2015-04-08 17:18:04 +05:30
Jayesh Kariya
a9ba68699a adding states/sysctl unit test case. 2015-04-08 16:25:57 +05:30
Rahul Handay
0fdda87e23 Adding states svn.py unit test cases 2015-04-08 16:20:51 +05:30
Jayesh Kariya
3002729f72 adding states/grains unit test case. 2015-04-08 14:13:20 +05:30
Rahul Handay
ea5a039858 Adding win_repo.py unit test cases 2015-04-08 14:07:03 +05:30
Justin Findlay
ff97167498 Merge pull request #22450 from jacksontj/2015.2
Remove grains outputter from grains modules
2015-04-07 22:22:16 -06:00
Nicole Thomas
928a399ef7 Merge pull request #22449 from whiteinge/doc-jinja-strftime-fuzzy
Separated fuzzy dates from non-fuzzy in strftime Jinja example
2015-04-07 20:11:46 -06:00
Seth House
d7b1f14133 Merge pull request #22445 from rallytime/fix-19044
Add docs explaing file_map upload functionality
2015-04-07 19:34:54 -06:00
Seth House
892f7c8905 Separated fuzzy dates from non-fuzzy in strftime Jinja example 2015-04-07 19:23:38 -06:00
Thomas Jackson
2ca422d967 Remove grains outputter from grains modules
Since we have removed the grains outputter (#20172) we should stop trying to talk to it
2015-04-07 18:17:04 -07:00
rallytime
7a9ce92dd9 Add docs explaing file_map upload functionality
Fixes #16886
2015-04-07 17:23:02 -06:00
Gareth J. Greenaway
b73351eed8 runner_doc in sysmod requires salt.runner to be imported. 2015-04-07 16:07:44 -07:00
C. R. Oldham
7c2b2157e7 Better missing patch error 2015-04-07 16:33:09 -06:00
Nicole Thomas
77efcffca2 Merge pull request #22439 from rallytime/fix-pylint
Fix pylint errors that snuck into 2015.2
2015-04-07 16:17:40 -06:00
Justin Findlay
dd5c68fef3 Merge pull request #22427 from garethgreenaway/22415_2015_2_gpg_module_fixes
backporting #22422 to 2015.2
2015-04-07 15:58:02 -06:00
rallytime
6b4b51a7f8 Fix pylint errors that snuck into 2015.2 2015-04-07 15:44:36 -06:00
Justin Findlay
ade247443d Merge pull request #22426 from jraby/patch-1
don't repeat the "if ret['changes']" condition
2015-04-07 15:42:39 -06:00
Nicole Thomas
9709fb47cd Merge pull request #22436 from ckochenower/2015.2
Add versionadded label for event_return
2015-04-07 15:40:33 -06:00
Justin Findlay
4c8d351dbf Merge pull request #22416 from rallytime/bp-21044
Backport #21044 to 2014.7
2015-04-07 15:19:32 -06:00
Justin Findlay
f76c5b4a56 Merge pull request #22433 from rallytime/fix-22218
Clarify that an sls is not available on a fileserver
2015-04-07 14:36:10 -06:00
Justin Findlay
70ba52fcee Merge pull request #22434 from rallytime/bp-22414
Backport #22414 to 2014.7
2015-04-07 14:34:57 -06:00
Corin Kochenower
911345dd1a Add versionadded label for event_return 2015-04-07 14:15:03 -06:00
Frank Klaassen
4a141c0f89 Lint 2015-04-07 13:19:14 -06:00
Frank Klaassen
09e9b6ea95 Do not look for disk underneath config 2015-04-07 13:19:14 -06:00
rallytime
f22f4dc4fc Clarify that an sls is not available on a fileserver
Instead of just assuming that it should be looking to the master only.

Refs #22218
2015-04-07 13:12:58 -06:00