valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
46,040 Commits 24 Branches 182 Tags 341 MiB
bdfdd3f232
Commit Graph

46040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
bdfdd3f232 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/modules/virt.py
 2015-03-11 16:09:57 -06:00
Colton Myers
ebe7eeafd9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/conf.py
	doc/man/salt-api.1
	doc/man/salt-call.1
	doc/man/salt-cloud.1
	doc/man/salt-cp.1
	doc/man/salt-key.1
	doc/man/salt-master.1
	doc/man/salt-minion.1
	doc/man/salt-run.1
	doc/man/salt-ssh.1
	doc/man/salt-syndic.1
	doc/man/salt-unity.1
	doc/man/salt.1
	doc/man/salt.7
	salt/cloud/clouds/linode.py
	salt/states/composer.py
	salt/states/win_update.py
 2015-03-11 15:14:56 -06:00
Thomas S Hatch
f3ec86f855 Merge pull request #21514 from rallytime/manually_backport_21489 
Apply fix from #21489 to the 2014.7 branch
 2015-03-11 15:05:57 -06:00
Thomas S Hatch
44df93dad1 Merge pull request #21562 from cro/bp-21283 
Backport 21283 from develop.
 2015-03-11 15:05:43 -06:00
Thomas S Hatch
4873382184 Merge pull request #21487 from rallytime/bp-21469 
Backport #21469 to 2014.7
 2015-03-11 15:05:08 -06:00
jfindlay
979ed6628e Merge pull request #21559 from s0undt3ch/hotfix/issues-21522 
Don't obfuscate the internal version attribute
 2015-03-11 14:36:36 -06:00
jfindlay
3624f39105 Merge pull request #21558 from s0undt3ch/2015.2 
[2015.2] Update the bootstrap script to latest stable, v2015.03.15
 2015-03-11 14:27:31 -06:00
jfindlay
70608d8f9e Merge pull request #21557 from s0undt3ch/2014.7 
[2014.7] Update the bootstrap script to latest stable, v2015.03.15
 2015-03-11 14:27:18 -06:00
Thomas S Hatch
0d278a4746 Merge pull request #21523 from jfindlay/bp-21481 
backport #21481 to 2014.7
 2015-03-11 14:21:33 -06:00
Thomas S Hatch
2fa41897ad Merge pull request #21555 from xclusv/2014.7-fix-21491 
Fix for issue #21491
 2015-03-11 14:21:18 -06:00
Thomas S Hatch
8cd484901d Merge pull request #21564 from eliasp/patch-1 
Typo (rendered → renderer)
 2015-03-11 14:20:12 -06:00
Elias Probst
bc9a30b7e9 Typo (rendered → renderer) 2015-03-11 21:15:32 +01:00
Daniel Wallace
470bc06835 remove extra log.debug 2015-03-11 13:23:18 -06:00
Daniel Wallace
f049fe855b change deafult for kwargs 
To None?
 2015-03-11 13:23:18 -06:00
Daniel Wallace
739935c246 pass kwargs so that fixed networks can be set 2015-03-11 13:23:18 -06:00
Daniel Wallace
fdcd4a03f7 split out setting up networks 2015-03-11 13:22:45 -06:00
Pedro Algarvio
e5a7158069 Don't obfuscate the internal version attribute 
Fixes #21522
 2015-03-11 19:21:59 +00:00
Daniel Wallace
1270a2bd3f need to use data for changing password 2015-03-11 13:21:08 -06:00
Daniel Wallace
4b417f748c use ex_set_password 2015-03-11 13:21:08 -06:00
Daniel Wallace
8d34dcd09c use ex_get_node_details if instance_id is specified 2015-03-11 13:21:08 -06:00
Ross Perkins
d473408074 composer.install module does not support always_check, only the state does. Removing the test on the module. 2015-03-11 12:19:17 -07:00
Pedro Algarvio
3f90ba9dc3 Update the bootstrap script to latest stable, v2015.03.15 
* Add multi-master support. Thanks Fred Reimer(freimer). saltstack/salt-boostrap#555
 2015-03-11 19:10:10 +00:00
Pedro Algarvio
397f45ede4 Update the bootstrap script to latest stable, v2015.03.15 
* Add multi-master support. Thanks Fred Reimer(freimer). saltstack/salt-boostrap#555
 2015-03-11 19:09:09 +00:00
rallytime
e4b33ef121 Move minidom import out of try block 2015-03-11 12:43:31 -06:00
Ross Perkins
ee1a8d7ad0 Fix lint issue. 2015-03-11 11:36:34 -07:00
Ross Perkins
3f3218d853 Fix for issue #21491 2015-03-11 11:33:39 -07:00
Thomas S Hatch
a531ab0066 Merge pull request #21551 from robgott/fix-s3.head-returning-none 
updated s3.query function to return headers for successful requests
 2015-03-11 12:12:19 -06:00
Thomas S Hatch
0eb66a36cb Merge pull request #21162 from cro/linode-python-driver2 
Update linode salt-cloud driver to support using either linode-python or apache-libcloud
 2015-03-11 11:45:15 -06:00
Thomas S Hatch
32eb382789 Merge pull request #21542 from whiteinge/doc-ext_pillar_first_version 
Added versionadded for ext_pillar_first
 2015-03-11 11:18:15 -06:00
Thomas S Hatch
0e2a1a43fb Merge pull request #21540 from lorengordon/fix-saltstack-issue21093 
Update `new_file` if append or prepend required
 2015-03-11 11:18:10 -06:00
Rob Gott
8999148da0 updated s3.query function to return headers array for successful requests 
fixes issue with s3.head returning None for files that exist
 2015-03-12 03:02:22 +10:00
Seth House
049975a1ca Added versionadded for ext_pillar_first 2015-03-11 11:53:59 -04:00
Thomas S Hatch
1f26388155 Merge pull request #21530 from freimer/issue_21528 
Add multi-master-pki capability to cloud deploy.
 2015-03-11 09:49:44 -06:00
David Boucha
3012e98577 Merge pull request #21536 from eliasp/2014.7-salt.states.win_update.py-typo 
Correct typo ('win_update.install' → 'win.update_installed').
 2015-03-11 09:17:28 -06:00
Loren Gordon
7f63290263 Update new_file if append or prepend required 
Fixes saltstack#21093
 2015-03-11 10:40:38 -04:00
Elias Probst
0b02396224
Correct typo ('win_update.install' → 'win.update_installed'). 2015-03-11 09:49:15 +01:00
Fred Reimer
a9d2a384e3
Add multi-master-pki capability to cloud deploy. 
Note that salt-bootstrap needs to be updated to copy the master_sign.pub file from the temp directory to the pki minion directory for this to work with Linux.  Verified for Windows hosts.
 2015-03-10 22:15:50 -04:00
jfindlay
1d60775297 Merge pull request #21524 from whiteinge/doc-django-auth-backend 
Formatted the Django auth backend docstrings
 2015-03-10 18:14:17 -06:00
Thomas S Hatch
796ddf0eee Merge pull request #21515 from cachedout/catch_returner_exc 
Catch returner exc
 2015-03-10 17:59:09 -06:00
jfindlay
691c3f03ac Merge pull request #21519 from terminalmage/versionadded 
Add a versionadded directive for new function
 2015-03-10 17:58:50 -06:00
Seth House
8c682fb7f6 Formatted the Django auth backend docstrings 2015-03-10 19:13:13 -04:00
Daniel Hobley
08bd4761df Fixed an error with SIGKILL on windows 2015-03-10 17:09:13 -06:00
Erik Johnson
fc68ea9dff Add a versionadded directive for new function 2015-03-10 17:51:00 -05:00
Mike Place
aa76f2f3b8 Lint 2015-03-10 16:31:34 -06:00
Mike Place
1e5d40584d Finish returner exception handling 2015-03-10 16:30:12 -06:00
rallytime
ee159ff3df Apply fix from #21489 to the 2014.7 branch 
This code has been refactored in develop, so the original
pull request wasn't backporting cleanly. This applies the same fix
to the older branch(es).
 2015-03-10 15:52:24 -06:00
Mike Place
faf580ec82 More exception handling for returners 2015-03-10 15:52:06 -06:00
Mike Place
d1f3b86205 Catch all returner exceptions 2015-03-10 15:38:32 -06:00
jfindlay
d329f10068 Merge pull request #21512 from terminalmage/more-outputter-deprecation 
Additional deprecation of outputter arg in runner funcs
 2015-03-10 15:30:25 -06:00
Thomas S Hatch
d8f4160170 Merge pull request #21510 from twangboy/win_service 
Fixed disable function in win_service.py to actually disable service
 2015-03-10 15:14:31 -06:00