valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
35,725 Commits 24 Branches 182 Tags 341 MiB
0c05702184
Commit Graph

35725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
0c05702184 Merge pull request #15193 from techhat/clouddocs 
Cloud cache is now msgpack, not json
 2014-08-22 14:11:08 -06:00
Joseph Hall
3571d3eb3c Cloud cache is now msgpack, not json 2014-08-22 13:22:25 -06:00
Joseph Hall
1db825be19 Merge pull request #15191 from hulu/sodium-spacing 
sodium_grabber_installer: fix kwarg spacing
 2014-08-22 13:20:00 -06:00
Chris Rebert
fcc41721fd sodium_grabber_installer: fix kwarg spacing 
************* Module sodium_grabber_installer
pkg/smartos/esky/sodium_grabber_installer.py:16: [C0326(bad-whitespace), ] No space allowed around keyword argument assignment
    sources = [path.join(HERE, 'sodium_grabber.c')],
            ^
pkg/smartos/esky/sodium_grabber_installer.py:17: [C0326(bad-whitespace), ] No space allowed around keyword argument assignment
    libraries = ['sodium'],
              ^
 2014-08-22 12:04:34 -07:00
Joseph Hall
dbbecefa99 Merge pull request #15190 from hulu/random-copyediting 
copyedits
 2014-08-22 13:02:55 -06:00
Chris Rebert
a53ae15d23 copyedits 2014-08-22 11:59:13 -07:00
Thomas S Hatch
224acd25df Merge pull request #15174 from steverweber/slspath_fix 
change var slspathdot to slsdotpath
 2014-08-22 12:30:17 -06:00
Thomas S Hatch
0817e60494 Merge pull request #15168 from lyft/14752-boto_get_group-ignores-region 
Resove issue with ignored region argument
 2014-08-22 12:26:44 -06:00
Thomas S Hatch
26f6acc1d0 Merge pull request #15163 from garethgreenaway/apply_hostname 
Changes to modules debian_ip and rh_ip, and the network.py state
 2014-08-22 12:13:18 -06:00
Thomas S Hatch
1ae169b9e0 Merge pull request #15188 from thatch45/develop 
Cleaning
 2014-08-22 11:39:15 -06:00
Thomas S Hatch
b9a55579ce Merge branch 'develop' of github.com:saltstack/salt into develop 
Conflicts:
	salt/cloud/__init__.py
 2014-08-22 11:38:38 -06:00
Thomas S Hatch
fc179f2f6f Merge pull request #15179 from cingeyedog/develop 
Changing default hash in file.py
 2014-08-22 11:18:41 -06:00
Pedro Algarvio
92cd6ece62 Merge pull request #15181 from techhat/cloudrender 
Send cloud maps through salt renderer system
 2014-08-22 18:08:19 +01:00
Joseph Hall
97575e0366 Linting 2014-08-22 10:32:42 -06:00
Joseph Hall
b8123b2497 Send cloud maps through salt renderer system 2014-08-22 09:58:00 -06:00
cingeyedog
e1e902bacc Changing default hash in file.py 
Changed default hashtype in file.py to sha256.  This was not reading
the hash_type from the minion config.  FIPS doesnt allow md5 as a valid
hash type.

          ID: /etc/snmp/snmpd.conf
    Function: file.managed
      Result: False
     Comment: An exception occurred in this state: Traceback (most
recent call last):
                File "/usr/lib/python2.6/site-packages/salt/state.py",
line 1379, in call
                  **cdata['kwargs'])
                File
"/usr/lib/python2.6/site-packages/salt/states/file.py", line 1246, in
managed
                  **kwargs
                File
"/usr/lib/python2.6/site-packages/salt/modules/file.py", line 2363, in
check_managed
                  **kwargs)
                File
"/usr/lib/python2.6/site-packages/salt/modules/file.py", line 2106, in
get_managed
                  hsum = get_hash(sfn)
                File
"/usr/lib/python2.6/site-packages/salt/modules/file.py", line 424, in
get_hash
                  return salt.utils.get_hash(path, form, chunk_size)
                File
"/usr/lib/python2.6/site-packages/salt/utils/__init__.py", line 1468,
in get_hash
                  hash_obj = hash_type()
              ValueError: error:060800A3:digital envelope
routines:EVP_DigestInit_ex:disabled for fips
 2014-08-22 11:17:53 -04:00
Steve Weber
d4c5cc7056 change var slspathdot to slsdotpath 2014-08-22 09:53:58 -04:00
Colin Johnson
8192720f21 Resove issue with ignored region argument https://github.com/saltstack/salt/issues/14752 2014-08-22 06:09:18 +00:00
Thomas S Hatch
61d9f69d0e How long has that been in there? 2014-08-21 21:16:33 -06:00
Thomas S Hatch
4b785ea32b Merge branch '2014.7' into develop 2014-08-21 18:42:28 -06:00
Thomas S Hatch
c887a04a85 Merge pull request #15164 from thatch45/raet_route_fix 
Fix raet resolver routines
 2014-08-21 18:41:05 -06:00
Thomas S Hatch
9ef26f8af1 Merge pull request #1 from whiteinge/raet-auth-router 
Changed a few router defaults
 2014-08-21 18:40:52 -06:00
Seth House
5b8f2a471a Changed a few router defaults 2014-08-21 18:38:11 -06:00
Gareth J. Greenaway
783e00e954 updates to debian_ip and rh_ip to allow applying hostname changes immediately. 2014-08-21 16:45:57 -07:00
Thomas S Hatch
e502d295d5 Merge pull request #15162 from gtmanfred/haproxyconn 
add version added note for haproxy
 2014-08-21 17:29:45 -06:00
Thomas S Hatch
f0009be6c2 Merge branch '2014.7' into develop 2014-08-21 17:20:26 -06:00
Thomas S Hatch
2fc6267abc Fix raet resolver routines 2014-08-21 17:06:29 -06:00
Daniel Wallace
7e4a327d0d fix to use the correct number of dots 2014-08-21 17:34:36 -05:00
Daniel Wallace
d366047c36 add version added note for haproxy 2014-08-21 17:29:24 -05:00
Thomas S Hatch
12d8638f8f Merge pull request #15161 from saltstack/revert-15120-develop 
Revert "automatically use novaclient plugins"
 2014-08-21 15:53:57 -06:00
Thomas S Hatch
25cca80ae7 Revert "automatically use novaclient plugins" 2014-08-21 15:53:51 -06:00
Thomas S Hatch
60381dbed5 Merge pull request #15160 from saltstack/revert-15150-develop 
Revert "only load functions and hooks once"
 2014-08-21 15:53:48 -06:00
Thomas S Hatch
1fd556f07d Revert "only load functions and hooks once" 2014-08-21 15:53:40 -06:00
Thomas S Hatch
0da56fcd03 Merge pull request #15150 from gtmanfred/develop 
only load functions and hooks once
 2014-08-21 15:14:10 -06:00
Thomas S Hatch
2d47589c88 Merge pull request #15140 from terminalmage/pygit2-auth 
Add gitfs authentication support for pygit2>=0.20.3
 2014-08-21 15:03:35 -06:00
Thomas S Hatch
6ca5cd9ab3 Merge pull request #15157 from saltstack/revert-15136-reload-grains-with-modules-for-states 
Revert "Reload grains with modules for states"
 2014-08-21 14:50:00 -06:00
Thomas S Hatch
5970b4c529 Revert "Reload grains with modules for states" 2014-08-21 14:49:25 -06:00
Thomas S Hatch
899997e3d5 Merge pull request #15153 from nshalman/esky-improvements-2014.7 
SmartOS esky packaging of 2014.7
 2014-08-21 14:38:40 -06:00
Thomas S Hatch
cbca184b13 Merge pull request #15146 from techhat/notpresent 
Add manage.not_present
 2014-08-21 14:38:24 -06:00
Thomas S Hatch
08c8697323 Merge pull request #15123 from cachedout/cli_check_cache 
Have CLI check job cache
 2014-08-21 14:36:10 -06:00
Erik Johnson
ec07a8efea Get effective username using pwd.getpwduid() 2014-08-21 15:22:54 -05:00
Joseph Hall
065818a0a0 Linting 2014-08-21 14:21:23 -06:00
Thomas S Hatch
44fe6630a6 Merge pull request #15148 from megaclite/develop 
Fixed put method in swift module
 2014-08-21 14:03:20 -06:00
Thomas S Hatch
409df9ebcc Merge pull request #15147 from pass-by-value/eventlisten_warning 
Warn if eventlisten is unable to access socket
 2014-08-21 14:01:51 -06:00
Nahum Shalman
cdae8948a1 SmartOS esky packaging of 2014.7 
Resulting builds can be used either with zeromq or with raet
 2014-08-21 16:01:46 -04:00
Thomas S Hatch
afa619ac1a Merge pull request #15127 from teepark/mount-options 
fix the mount.mounted opts default value behavior
 2014-08-21 13:57:10 -06:00
Daniel Wallace
cb3151ccfa only load functions and hooks once 
novaclient doesn't check if it has already loaded extensions, so we only
want to run this ones, the first time that it is loading, since we
are manually overwriting the classes in memory anyway.
 2014-08-21 14:50:18 -05:00
Thomas S Hatch
48c1d2da9f Merge pull request #15149 from cvrebert/patch-1 
modules.service.__virtual__: use raw string for regex
 2014-08-21 13:40:37 -06:00
Erik Johnson
43de873bb2 D'oh, needed to capitalize USERNAME 2014-08-21 14:35:36 -05:00
Seth House
4abc45397d Merge remote-tracking branch 'upstream/2014.7' into develop 2014-08-21 13:23:52 -06:00