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
47,182 Commits 24 Branches 182 Tags 341 MiB
927be7daea
Commit Graph

47182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
927be7daea Merge pull request #22861 from basepi/merge-forward-2015.2 
[2015.2] Merge forward from 2014.7 to 2015.2
 2015-04-20 16:18:02 -06:00
Thomas S Hatch
6bfd57a921 Merge pull request #22868 from nmadhok/bugfix 
Backport #22860 to 2015.2
 2015-04-20 16:07:30 -06:00
Nitin Madhok
eeb42849f8 Backport #22860 2015-04-20 17:21:49 -04:00
Justin Findlay
3e8ebfe38e Merge pull request #22859 from whiteinge/salt-api-upstart 
Back-ported salt-api upstart script from develop
 2015-04-20 13:28:18 -06:00
Colton Myers
1f9934c634 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/gitfs.rst
 2015-04-20 11:39:41 -06:00
Seth House
419a483750 Back-ported salt-api upstart script from develop 
Added in ffe1ba6
 2015-04-20 11:11:35 -06:00
Thomas S Hatch
d5d1ddc8d6 Merge pull request #22705 from jayeshka/win_dns_client_unit_test 
adding win_dns_client test case and used @patch for mocking.
 2015-04-20 09:50:22 -06:00
Thomas S Hatch
9599795bf0 Merge pull request #22828 from cro/svcbeacon_features 
Add onchangeonly and uncleanshutdown to service beacon
 2015-04-20 09:40:41 -06:00
Justin Findlay
3651d21ad4 Merge pull request #22743 from jayeshka/netscaler-unit-test 
adding netscaler unit test case
 2015-04-20 09:25:17 -06:00
Thomas S Hatch
c45b92bb4b Merge pull request #22578 from hvnsweeting/2014-7-fix-compile-pillar 
gracefully handle when salt-minion cannot decrypt key
 2015-04-20 09:24:44 -06:00
Thomas S Hatch
0525f17c50 Merge pull request #22683 from matdrapeau/22682_deploy_key_machine_id 
Making ssh-copy-id using the provided machine name and not ip
 2015-04-20 09:23:44 -06:00
Thomas S Hatch
e197e491d5 Merge pull request #22819 from msteed/issue-21615 
cli: don't report syndics as unresponsive minions
 2015-04-20 09:15:32 -06:00
Thomas S Hatch
a7ff60491b Merge pull request #22815 from plastikos/issue-22797 
Fix failure with nested nodegroups:
 2015-04-20 09:12:54 -06:00
C. R. Oldham
1f49663eb7 Make sure we are checking for the right dictionary entry 2015-04-18 22:02:54 -06:00
C. R. Oldham
6a4a399897 Lint. 2015-04-18 13:20:38 -06:00
Justin Findlay
900c7a510f Merge pull request #22800 from terminalmage/issue21979 
Improve error logging for pygit2 SSH-based remotes
 2015-04-18 11:18:55 -06:00
C. R. Oldham
bbaed57edb Add onchangeonly and uncleanshutdown parameters to service beacon. 2015-04-18 10:56:46 -06:00
Justin Findlay
e99f2fdb28 Merge pull request #22813 from twangboy/win_doc_fix 
Updated instructions for building salt
 2015-04-17 22:10:07 -06:00
Erik Johnson
8f1c0084cd Clarify that for pygit2, receiving 0 objects means repo is up-to-date 
This seems to be too confusing to users, so this changes the log message
to say that the repo is up-to-date instead of saying that 0 objects were
received.
 2015-04-17 22:11:40 -05:00
Viet Hung Nguyen
f75b24ad68 gracefully handle when salt-minion cannot decrypt key 
or salt-minion will die. Returns None to deligate
this job to compile_pillar function handle it,
as it is the only caller of this function for now
 2015-04-18 09:52:36 +07:00
Thayne Harbaugh
b37b6b2849 Add a test for incorrectly-nested nodegroups that cause a resolution loop. 2015-04-17 17:01:47 -06:00
Michael Steed
1d6125fb07 cli: don't report syndics as unresponsive minions 
Record syndic ids on the master as they return. On the cli, don't report
known syndics as unresponsive minions. Issue #21615
 2015-04-17 16:29:38 -06:00
Colton Myers
fe1de89ad7 Merge pull request #22810 from basepi/salt-ssh.more.msgpack.gating 
[2014.7] More msgpack gating for salt-ssh
 2015-04-17 16:28:24 -06:00
Mathieu Drapeau
90b696eb2b Changed the clustershell roster addr to host instead 2015-04-17 18:27:09 -04:00
Mathieu Drapeau
7167d54817 Making ssh-copy-id using the provided machine name and not ip 
This fixes: https://github.com/saltstack/salt/issues/22682
 2015-04-17 18:27:09 -04:00
Colton Myers
180f2af73b Merge pull request #22808 from basepi/salt-ssh.list.targeting 
[2015.2] Add list targeting to salt-ssh flat roster
 2015-04-17 16:10:09 -06:00
Thayne Harbaugh
6c1d4d58e9 Fix failure with nested nodegroups: 
If a nodegroup was re-used - even if it wasn't a circular reference - it
would fail the nodegroup expansion with the following message:

    Failed nodegroup expansion: illegal nested nodegroup "min"

This was simply because already-visited nodegroups are pushed into `skip`
but were never popped.

   * Add another test case for this situation.
   * Pop the current nodegroup from `skip` when leaving the expansion
     context

Fixes: #22797
 2015-04-17 15:20:34 -06:00
Thomas S Hatch
258ef59cbe Merge pull request #22804 from rallytime/bp-22765 
Backport #22765 to 2015.2
 2015-04-17 15:07:05 -06:00
twangboy
adc421acdd Fixed some formatting issues 2015-04-17 15:03:47 -06:00
Justin Findlay
1c288dc146 Merge pull request #22505 from jayeshka/sysmod-unit-test 
adding sysmod unit test case.
 2015-04-17 15:03:39 -06:00
twangboy
8901b3b5a6 Updated instructions for building salt 2015-04-17 14:41:46 -06:00
Joseph Hall
11df71e16d Merge pull request #22803 from rallytime/fix-17144 
Allow map file to work with softlayer
 2015-04-17 14:34:42 -06:00
Colton Myers
d4da8e66a4 Gate msgpack in salt/modules/saltutil.py 2015-04-17 14:33:19 -06:00
Thomas S Hatch
cd43a95212 Merge pull request #22807 from rallytime/windows_docs_update 
Add 2014.7.5 links to windows installation docs
 2015-04-17 14:32:13 -06:00
Colton Myers
02303b22ce Gate msgpack in salt/modules/data.py 2015-04-17 14:32:02 -06:00
Colton Myers
d7e8741f02 Gate salt.states.file.py msgpack 
Fixes #22708
 2015-04-17 14:29:23 -06:00
Colton Myers
e25ac2da82 Dict, not list 2015-04-17 14:21:20 -06:00
Colton Myers
e17523afb1 It's already been converted to a list 2015-04-17 14:20:28 -06:00
rallytime
5931a582d1 Replace all 4s with 5s 2015-04-17 14:15:33 -06:00
rallytime
eadaead755 Add 2014.7.5 links to windows installation docs 2015-04-17 14:13:40 -06:00
Colton Myers
6a232d1b49 Add list targeting to salt-ssh flat roster 
Fixes #22703
 2015-04-17 14:00:21 -06:00
Dmitri Muntean
085ee287d2 Requests to AWS instance metadata should never be proxied 
Enforce usage of no proxies for requests that query instance metadata
service in AWS. Trying to access this URI via proxy always returns 404.
This caters for the case when proxy settings are picked up from environment,
but NO_PROXY is not correctly set.
 2015-04-17 13:45:55 -06:00
rallytime
ce88b6ad41 Allow map file to work with softlayer 
Refs #17144
 2015-04-17 13:33:22 -06:00
Nicole Thomas
3049183f07 Merge pull request #22775 from jayeshka/alternatives-states-unit-test 
adding states/alternatives unit test case
 2015-04-17 13:18:30 -06:00
Thomas S Hatch
ba8c70100a Merge pull request #22802 from rallytime/bp-22799 
Backport #22799 to 2015.2
 2015-04-17 13:17:29 -06:00
Nitin Madhok
90fa6dede7 Fixes #22792 2015-04-17 13:16:13 -06:00
Justin Findlay
977edf1755 Merge pull request #22794 from basepi/merge-forward-2015.2 
[2015.2] Merge forward from 2014.7 to 2015.2
 2015-04-17 12:49:52 -06:00
Justin Findlay
81a28af3bd Merge pull request #22786 from rallytime/bp-21072 
Backport #21072 to 2015.2
 2015-04-17 12:44:26 -06:00
Erik Johnson
98885f71d6 Add information about libssh2 requirement for pygit2 ssh auth 2015-04-17 13:24:14 -05:00
Nicole Thomas
4d396e5e94 Merge pull request #22777 from jayeshka/apache_module-states-unit-test 
adding states/apache_module unit test case
 2015-04-17 12:08:01 -06:00