Thomas S Hatch
|
ef5d6c1035
|
Merge branch 'cachedout-issue_18512' into 2015.2
|
2015-04-16 10:55:18 -06:00 |
|
Thomas S Hatch
|
a9e1a0943a
|
lint
|
2015-04-16 10:54:54 -06:00 |
|
Thomas S Hatch
|
13d161f2d7
|
Merge branch 'issue_18512' of https://github.com/cachedout/salt into cachedout-issue_18512
|
2015-04-16 10:54:29 -06:00 |
|
Thomas S Hatch
|
3362c13625
|
Merge pull request #22687 from lyft/boto-iam-consistency
Make boto_iam more consistent with boto_iam_role for groups
|
2015-04-16 10:52:41 -06:00 |
|
Thomas S Hatch
|
073e01915e
|
Merge pull request #22737 from ticosax/ports-not-exposed-has-no-ip
[salt.mine.get_docker] Discard containers that doesn't expose their internal ports.
|
2015-04-16 10:47:11 -06:00 |
|
Thomas S Hatch
|
23a4f0d720
|
Merge pull request #22735 from plastikos/improvement-portability_tweak
Use string_types for portability
|
2015-04-16 10:46:58 -06:00 |
|
Colton Myers
|
8d9874a78a
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
|
2015-04-16 10:37:38 -06:00 |
|
Thomas S Hatch
|
94e4e6bc1e
|
Merge pull request #22723 from thatch45/lazy_layers
Fix the lazy loader to keep a top level key ref
|
2015-04-16 10:36:26 -06:00 |
|
Justin Findlay
|
e586c66917
|
revise contributing documentation
|
2015-04-16 10:28:00 -06:00 |
|
Nicole Thomas
|
75348e5113
|
Merge pull request #22748 from twangboy/fix_bat
Changed %cd% to %~dp0
|
2015-04-16 10:27:31 -06:00 |
|
Nitin Madhok
|
b90471b275
|
Lint fix
|
2015-04-16 12:01:02 -04:00 |
|
Nicole Thomas
|
1bb93d29af
|
Merge pull request #22660 from basepi/merge-forward-2015.2
[2015.2] Merge forward from 2014.7 to 2015.2
|
2015-04-16 10:00:11 -06:00 |
|
Nitin Madhok
|
60d240430d
|
Adding create_cluster() to be able to create new host clusters
|
2015-04-16 11:55:12 -04:00 |
|
Thomas S Hatch
|
c003252a8e
|
Fix test
|
2015-04-16 09:33:50 -06:00 |
|
salt_build
|
2d3d0b1c15
|
Changed %cd% to %~dp0
|
2015-04-16 15:07:28 +00:00 |
|
Justin Findlay
|
bacbf6cfa5
|
Merge pull request #22741 from jayeshka/lvm-states-unit-test
adding states/lvm test case
|
2015-04-16 07:20:10 -06:00 |
|
Justin Findlay
|
988ea97a0c
|
Merge pull request #22739 from rahulhan/states_network_unit_tests
Adding states/network.py unit tests
|
2015-04-16 07:19:22 -06:00 |
|
Justin Findlay
|
f29e7a571b
|
Merge pull request #22736 from bemeyert/21840-improve_cmd.run_env_docs
improve cmd.run env documentation
|
2015-04-16 07:17:16 -06:00 |
|
Jayesh Kariya
|
0ef4df8e0f
|
adding netscaler unit test case
|
2015-04-16 17:21:51 +05:30 |
|
Jayesh Kariya
|
a32da0c8df
|
adding states/lvm test case
|
2015-04-16 17:09:26 +05:30 |
|
Rahul Handay
|
2a977cada7
|
Adding states/network.py unit tests
|
2015-04-16 16:19:21 +05:30 |
|
Nicolas Delaby
|
fd352dde61
|
'IP' is present in response only if the port is exposed to the host.
|
2015-04-16 12:05:10 +02:00 |
|
Markus "Shorty" Uckelmann
|
1341784184
|
improve cmd.run env documentation
Resolves #21840
Improved documentation to cmd.run(et.al.) env argument by mentioning
that variables as values will not be evaluated.
|
2015-04-16 11:20:20 +02:00 |
|
Thayne Harbaugh
|
f23d10e85a
|
Use string_types for portability
|
2015-04-16 02:39:22 -06:00 |
|
Thomas S Hatch
|
c031192f2d
|
Merge pull request #22675 from twangboy/winrepo_parsing
Winrepo sls files now run through the templating system
|
2015-04-15 22:52:19 -06:00 |
|
Thomas S Hatch
|
787ec88373
|
Merge pull request #22716 from twangboy/list_pkg_fix
Removed list_pkgs caching
|
2015-04-15 22:51:02 -06:00 |
|
Thomas S Hatch
|
7e91de265c
|
fix pyobjects loader change
|
2015-04-15 22:48:34 -06:00 |
|
Shane Lee
|
2b5b934402
|
Update winrepo.py
Fixed some more lint
|
2015-04-15 22:12:15 -06:00 |
|
Shane Lee
|
e6b9c5b29b
|
Update win_repo.py
Fixed some lint
|
2015-04-15 22:11:37 -06:00 |
|
Shane Lee
|
e1ee7db991
|
Update win_pkg.py
Fixed some lint
|
2015-04-15 22:10:02 -06:00 |
|
Thomas S Hatch
|
27ab725cf4
|
flix another place where the . is expected
|
2015-04-15 20:49:40 -06:00 |
|
Thomas S Hatch
|
6452590351
|
Merge pull request #22728 from whiteinge/fix-docmageddon
Add several modules to the mocked modules list for the docs build
|
2015-04-15 19:58:57 -06:00 |
|
Thomas S Hatch
|
f5b62236a0
|
Merge pull request #22726 from VynceMontgomery/patch-2
fix link to bug reporting in FAQ
|
2015-04-15 19:57:59 -06:00 |
|
Thomas S Hatch
|
19f35d42c4
|
fix attr lookups to use getitem
|
2015-04-15 19:44:06 -06:00 |
|
Thomas S Hatch
|
29d491964e
|
Add attr_call test function
|
2015-04-15 19:43:41 -06:00 |
|
Thomas S Hatch
|
f8cdc5060e
|
fix sysdoc tests for new module level hooks
|
2015-04-15 19:42:23 -06:00 |
|
Colton Myers
|
f84bfdba83
|
Merge pull request #22719 from basepi/fix_minion_id_generation
Fix minion id generation
|
2015-04-15 19:26:18 -06:00 |
|
Colton Myers
|
bb37e4f3e6
|
Merge pull request #22730 from basepi/2014.7.4releasenotes
Add minor CVEs to 2014.7.4 release notes
|
2015-04-15 19:02:06 -06:00 |
|
Colton Myers
|
ff8561df8d
|
Add minor CVEs to 2014.7.4 release notes
|
2015-04-15 19:01:28 -06:00 |
|
Nitin Madhok
|
6a05f52db2
|
Change log.error for checking action or function to raising SaltCloudSystemExit
|
2015-04-15 20:46:54 -04:00 |
|
Nitin Madhok
|
f3405eb500
|
Adding create_datacenter() to be able to create a datacenter
|
2015-04-15 20:40:44 -04:00 |
|
Seth House
|
fe8f3e0bce
|
Added generated doc for clustershell roster module
|
2015-04-15 18:34:27 -06:00 |
|
Seth House
|
f15e3ce7fa
|
Add missing blank line after code-block directive
Edits performed with this (imperfect) command:
find salt -name '*.py' -print0 \
| xargs -0 -n1 -P10 gawk -i inplace '
cb { if (match($0, /^$/) == 0) print ""; cb=0 }
{ print $0 }
/^\s*.. code-block::/ { cb=1 }
'
|
2015-04-15 18:30:36 -06:00 |
|
Nicole Thomas
|
5a32eeb911
|
Merge pull request #22722 from VynceMontgomery/patch-1
fix alphabetization
|
2015-04-15 18:17:54 -06:00 |
|
Thomas S Hatch
|
e9bd812ef8
|
Add module_report function to test
|
2015-04-15 18:11:44 -06:00 |
|
Thomas S Hatch
|
c1400fa60e
|
prevent grains from loading the module layer
|
2015-04-15 18:09:00 -06:00 |
|
Nitin Madhok
|
e754c166a4
|
Making wait messages contain the vmname (Helpful in parallel mode)
|
2015-04-15 19:58:54 -04:00 |
|
Vynce Montgomery
|
80d6e9ec94
|
fix link to bug reporting in FAQ
linebreak and bad path; one way or another, this was not rendering as a link.
|
2015-04-15 16:54:11 -07:00 |
|
Seth House
|
aaf1917bdf
|
Add mocked references for new module additions
|
2015-04-15 17:52:10 -06:00 |
|
Seth House
|
767c328420
|
Remove docs for old nagios_json module
|
2015-04-15 17:52:06 -06:00 |
|