valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
77,524 Commits 24 Branches 182 Tags 341 MiB
10b2224582
Commit Graph

77524 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
10b2224582 Merge pull request #38968 from raazvvann/dev/rheghedu/system-time 
system: change get_system_time returned format
 2017-01-26 11:28:29 -07:00
Mike Place
bd982c7122 Merge pull request #38969 from jakubjosef/develop 
Fixed generating job diffs in Jenkins state
 2017-01-26 11:22:59 -07:00
Mike Place
07f4c59a56 Merge pull request #38967 from raazvvann/dev/rheghedu/system-hostname 
system: add {set/get}_computer_name
 2017-01-26 11:01:08 -07:00
Jakub Josef
c64d2f88e5 Fixed generating job diffs in Jenkins state 2017-01-26 17:51:03 +01:00
Heghedus Razvan
5728490442 system: change get_system_time returned format 
Change returned format from "HH:MM AM/PM" to
"HH:MM:SS AM/PM"

Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
 2017-01-26 18:36:21 +02:00
Markus
7ff098426d comments on version number and git (#38961) 2017-01-26 09:21:16 -07:00
Heghedus Razvan
db41f60499 system: add {set/get}_computer_name 
Add {set/get}_computer_name for setting/getting
computer hostname. I add this in system module to be
the same as on windows, creating a cross-platform
way to interact with computer's hostname.

Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
 2017-01-26 17:47:41 +02:00
Mike Place
f9b2719ed3 Merge pull request #38942 from cloudflare/NET-RUNNER 
New runner: net finder
 2017-01-25 13:21:27 -07:00
Mike Place
5bea8bc5c1 Merge pull request #38943 from thatch45/ssh_pillar_master 
When we generate the pillar we should send in the master opts
 2017-01-25 13:10:19 -07:00
Mike Place
7ca6b81611 Merge pull request #38912 from daxroc/feature/http_wait_for_interval 
Enhanced wait_for_successful_query with request_interval
 2017-01-25 12:43:44 -07:00
Mike Place
bbadc37301 Merge pull request #38945 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-01-25 12:36:18 -07:00
Mike Place
7febac8669 Merge pull request #38947 from eradman/ssh_options 
Fix ssh key deployment when using minimal salt-ssh roster
 2017-01-25 12:35:56 -07:00
C. R. Oldham
c45b99661b Merge pull request #38920 from spidercensus/patch-1 
Add device port option to proxy
 2017-01-25 11:56:33 -07:00
Mircea Ulinic
2c5f21bc2b Import & use print_function from __future__ 2017-01-25 18:26:36 +00:00
Thomas S Hatch
289985502b try it with a different init sequence 2017-01-25 11:14:22 -07:00
Thomas S Hatch
49ddbbf298 make it a deepcopy 2017-01-25 10:57:20 -07:00
Eric Radman
3e03f8a400 Fix ssh key deployment when using minimal salt-ssh roster 
Allows this code path to succeed for a minimal roster file that does not
specify `ssh_options`

$ sudo salt-ssh 'login1*' test.ping
Permission denied for host login1, do you want to deploy the salt-ssh
key? (password required):
[Y/n] Y
Password for root@login1:
login1:
    True
 2017-01-25 12:43:11 -05:00
rallytime
49f57ba3f1 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/utils/win_functions.py
 2017-01-25 09:59:29 -07:00
Thomas S Hatch
4ae98ca2b6 make sure to copy the top dict reference since we are moding it 2017-01-25 09:44:16 -07:00
Thomas S Hatch
68d6449174 When we generate the pillar we should send in the master opts 
This better reflects how salt works per #38830
 2017-01-25 09:39:27 -07:00
Mircea Ulinic
317fb48ec7 net runner doc 2017-01-25 15:54:45 +00:00
Mircea Ulinic
cec75cd569 New runner: net finder 2017-01-25 15:53:01 +00:00
Jason Pack
60a095decd Add port option to proxy 
Added port parameter to junos device proxy
 2017-01-24 13:15:56 -05:00
Roche, Damien
1389c510ce fixed lint issues 2017-01-24 16:13:20 +00:00
Mike Place
0e102da679 Merge pull request #38887 from cro/vmware_reset_vm 
Enable resetting a VM via salt-cloud & VMware driver
 2017-01-24 08:22:35 -07:00
Mike Place
5ff5e97598 Merge pull request #38889 from cro/vmware_reset_vm_201611 
Backport #38887 to 2016.11: Call correct function for resetting a VM
 2017-01-24 08:20:28 -07:00
Roche, Damien
b3582f7a62 fixed lint issues 2017-01-24 15:19:36 +00:00
Mike Place
53d0aa8855 Merge pull request #38891 from UtahDave/fix_cassandra_protocol_version 
Proper function parameter default
 2017-01-24 08:06:08 -07:00
Mike Place
2aea960819 Merge pull request #38895 from clallen/sunos-cpu_model-grain-fix 
Fix for "cpu_model" core grain on some SPARC systems
 2017-01-24 08:03:06 -07:00
Mike Place
c680ee3174 Merge pull request #38904 from terminalmage/docs 
Add top file merging docs to the master config file documentation
 2017-01-24 07:59:25 -07:00
Roche, Damien
9191b22b2c Enhanced wait_for_successful_query with request_interval 2017-01-24 13:38:56 +00:00
Erik Johnson
42a3652620 Add top file merging docs to the master config file documentation 
Also put the top file stuff in its own section of the minion config
file, along with a message explaining that these options are only used
in masterless salt.
 2017-01-23 20:38:03 -06:00
Mike Place
5f456ec2ff Merge pull request #38898 from terminalmage/issue38878 
git.detached: rename ref to rev for consistency
 2017-01-23 19:02:35 -07:00
Mike Place
2ede44fe54 Merge pull request #38901 from stefano-pogliani/pillar_globs 
Apply glob pattern to file_roots and pillar_roots (master & minion).
 2017-01-23 18:35:02 -07:00
Stefano Pogliani
23468cbcd1 Apply glob pattern to file_roots and pillar_roots (master & minion). 
Implements #38736
 2017-01-23 23:30:34 +00:00
Erik Johnson
46aad90274 git.detached: rename ref to rev for consistency 
This deprecates the ref argument, adding a warning to the state return.
 2017-01-23 17:13:16 -06:00
Clint Allen
130093ad34 Fix for "cpu_model" core grain on some SPARC systems 
On certain T-Series SPARC systems, logical domains (LDOMs) can be
configured such that the CPU IDs do not start with 0.  This fix
allows the "cpu_model" grain to be set regardless of CPU ID
indexing.
 2017-01-23 16:26:39 -06:00
David Boucha
c475609683 Proper function parameter default 
Change `protocol_version` default to `None` because `protocol_version`
is determined below and has the same default.

ZD #1159
 2017-01-23 13:05:38 -07:00
C. R. Oldham
76a9920a6b Call correct function for resetting a VM 2017-01-23 13:04:19 -07:00
C. R. Oldham
ec7efddbc2 Revert unneeded change in opennebula driver 2017-01-23 12:59:35 -07:00
C. R. Oldham
724ab22f16 Call correct function for resetting a VM 2017-01-23 12:57:30 -07:00
C. R. Oldham
a70354071a Switch default filter tag for ONE resources from user only to all resources. Add get_one_version to return version of ONE. 2017-01-23 12:57:30 -07:00
Mike Place
41a3055213 Merge pull request #38885 from meaksh/2016.11-fix-tests-issues 
Increasing timeouts for running integrations tests
 2017-01-23 11:59:49 -07:00
Mike Place
bde6d3eee7 Merge pull request #38639 from isbm/isbm-disable-custom-roster-for-api-2016.11 
Isbm disable custom roster for api 2016.11
 2017-01-23 11:59:10 -07:00
Mike Place
88ec2d2ca4 Merge pull request #38716 from colinjkevans/fix_38318 
Fix for #38318
 2017-01-23 11:25:08 -07:00
Mike Place
e55cedf16f Merge pull request #38882 from gtmanfred/develop 
resolved_ips could be None
 2017-01-23 11:22:13 -07:00
Mike Place
afbbd2838a Merge pull request #38745 from vodik/fix-reconnect 
Fix salt-minion reconnection problem when master breaks connection
 2017-01-23 10:55:01 -07:00
Mike Place
fabc88cc0f Merge pull request #38824 from mcalmer/dockerng.build-add-buildargs 
add buildargs option to dockerng.build
 2017-01-23 10:27:47 -07:00
Pablo Suárez Hernández
4311b0b6de Increasing timeouts for running integrations tests 2017-01-23 16:55:48 +00:00
Mike Place
ec59ae67c8 Merge pull request #38859 from alxwr/2016.11 
fix parsing of sockstat -4
 2017-01-23 09:47:22 -07:00