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
74,698 Commits 24 Branches 182 Tags 341 MiB
f7d8bc7cc7
Commit Graph

74698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aditya Kulkarni
3877b1a9c8 Add full example for salt-api /events 2016-10-07 21:57:56 -04:00
Erik Johnson
7c78d6f419 Add unit tests for systemd scope usage 2016-10-07 17:35:09 -05:00
Super-User
8b12e190c6 rbac_solaris - correct a small logic error 2016-10-08 00:30:04 +02:00
rallytime
2e34277b65 Add '--no-psqlrc' option to new-to-carbon postgres unit test 2016-10-07 16:10:57 -06:00
Super-User
a6761e790b rbac_solaris - offer rbac.managed state 2016-10-08 00:07:25 +02:00
Nicole Thomas
6a6bdf3e3f Merge pull request #36853 from rallytime/bp-33939 
Back-port #33939 to 2016.3
 2016-10-07 15:44:32 -06:00
Super-User
94d2e9f545 rbac_solaris - fix issue with newlines 2016-10-07 23:44:25 +02:00
Nicole Thomas
0d78c70a30 Merge pull request #36850 from rallytime/bp-36736 
Back-port #36736 to carbon
 2016-10-07 15:44:18 -06:00
Eric Radman
0fdc155b73 Allow function privileges to be set (#36851) 
Since PG allows functions to be overloaded [1], the function name must
be specified with a list of types

    localharvest:
      postgres_privileges.present:
        - maintenance_db: localharvest
        - user: _postgresql
        - db_user: postgres
        - object_name: first_friday(text)
        - object_type: function
        - privileges:
          - EXECUTE
        - grant_option: False

If the function does takes no arguments use empty parens `()`.

[1]: https://www.postgresql.org/docs/current/static/sql-createfunction.html
 2016-10-07 15:43:08 -06:00
Nicole Thomas
01348bde18 Merge pull request #36852 from rallytime/bp-36743 
Back-port #36743 to 2016.3
 2016-10-07 15:35:43 -06:00
Super-User
f0c523cbdd fix broken mismerge 2016-10-07 22:38:41 +02:00
Super-User
01124b6881 rbac_solaris - asterix gets lost in the noise, readd it 2016-10-07 22:37:08 +02:00
Super-User
efe77582aa rbac_solaris - should also handle authorizations 2016-10-07 22:35:45 +02:00
Super-User
82faacb7f0 rbac_solaris - should also handle authorizations 2016-10-07 22:28:11 +02:00
Bartosz Burclaf
efbc09c1a6 Removed !-password check 2016-10-07 13:57:18 -06:00
Jacob Hammons
d179423a23 Doc updates for Carbon release candidate (#36847) 2016-10-07 13:50:03 -06:00
do3meli
899130d11f corrected OS Name in module load error message 2016-10-07 13:40:00 -06:00
Super-User
988b1ac738 rbac_solaris - add role support 2016-10-07 21:35:51 +02:00
Thomas S Hatch
406b2d232a clean up grains del val and key docs (#36825) 2016-10-07 13:34:18 -06:00
m03
b7f5f82cf6 Fix issue 36679 win_servermanager failure 2016-10-07 13:25:55 -06:00
Nicole Thomas
bb35006d90 Merge pull request #36846 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-10-07 13:22:45 -06:00
rallytime
af044fd889 Pylint fix 2016-10-07 13:22:02 -06:00
Nicole Thomas
0b7661244d Merge pull request #36844 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-07 13:20:31 -06:00
Super-User
9f4a04c1fe parse default profile(s) correctly 2016-10-07 20:57:46 +02:00
Super-User
d1d5748862 rbac_solaris - profile support 2016-10-07 18:30:54 +02:00
C. R. Oldham
dc5d821be6 Merge pull request #36835 from jfindlay/beacon_doc 
unify and expand beacon documentation
 2016-10-07 09:59:34 -06:00
C. R. Oldham
c9e3bd5b75 Merge pull request #36843 from ScoreUnder/osx_package_names 
pkg on Mac OSX: Support full package names
 2016-10-07 09:58:23 -06:00
rallytime
f6c0e195d7 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-07 09:53:05 -06:00
rallytime
f73bdf55c2 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/ini_manage.py
  - salt/states/glance.py
 2016-10-07 09:51:21 -06:00
rallytime
1c3a9a3ee9 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/minion.py
  - salt/output/highstate.py
 2016-10-07 09:39:48 -06:00
Score_Under
04d209bfa8 pkg on Mac OSX: Support full package names 
This makes _verify_install ignore everything up to and including the
final slash in a package name on Mac OSX, if that is necessary to find
the correct package.

This allows specifications to be prefixed with a tap name, like
"homebrew/science/a5".
 2016-10-07 14:55:07 +01:00
Super-User
eb9e7a3d26 smartos.vm_present state should have a way to disable enforcement of tags and metadata 2016-10-07 15:46:51 +02:00
carpenti
e1fd0d238a fix return of boto_ec2.instance_present if test=True 
if running boto_ec2.instance_present state in test=True mode, the return
is wrong if the instance already exists.

Example return before this commit:

----------
          ID: test-instance
    Function: boto_ec2.instance_present
        Name: test-instance
      Result: None
     Comment:
     Started: 13:15:20.790506
    Duration: 218.224 ms
     Changes:
----------

Example return after this commit:

----------
          ID: test-instance
    Function: boto_ec2.instance_present
        Name: test-instance
      Result: True
     Comment: Instance test-instance already present.
     Started: 13:18:32.013133
    Duration: 235.952 ms
     Changes:
----------
 2016-10-07 15:08:42 +02:00
Justin Findlay
b2eccdefd5 doc.topics.beacons: reflow text at 80 chars 2016-10-06 17:06:10 -06:00
Justin Findlay
b181f9890d doc.topics.{reactor|beacons}: unify examples, many minor edits 2016-10-06 17:06:10 -06:00
Justin Findlay
28b4e30009 doc.glossary: use parenthesis 2016-10-06 16:17:22 -06:00
Justin Findlay
82cf39db00 doc.glossary: add JID 2016-10-06 16:17:22 -06:00
Justin Findlay
cc071b75cb doc.glossary: add idempotent 2016-10-06 16:17:22 -06:00
C. R. Oldham
0df63da0ae Refactor repeat of _spawn_minions 2016-10-06 14:20:29 -06:00
C. R. Oldham
b7f9eb7864 Fix test. 2016-10-06 14:20:29 -06:00
C. R. Oldham
ea886434ad Lint, thought I caught this before 2016-10-06 14:20:29 -06:00
C. R. Oldham
b019c9967d Adapt MinionManager for Proxy Minions. Also default location of proxy minion PID files to include the minion_id. 
It's much more common to run multiple proxy minions on a machine and by default the proxy would abort because
of pidfile collision.
 2016-10-06 14:20:29 -06:00
Mike Place
10601528ea Merge pull request #36821 from cachedout/lint_develop 
Lint develop
 2016-10-06 21:39:43 +09:00
Mike Place
f44a45dabe
Lint develop 2016-10-06 21:38:40 +09:00
Mike Place
1284de27fc Merge pull request #36789 from maximeguillet/fix-psqlrc-pg9.6 
Fix behavior of psql -c option with postgresql 9.6
 2016-10-06 20:24:51 +09:00
Mike Place
f67ce5c180 Merge pull request #36794 from do3meli/freebsd-sysctl-fix 
FreeBSD sysctl module now handels config_file parameter in show method
 2016-10-06 20:24:00 +09:00
Mike Place
a1d59f4d2f Merge pull request #36797 from cachedout/issue_36579 
Error on reaction with missing SLS file
 2016-10-06 20:19:27 +09:00
Mike Place
bd199b8feb Merge pull request #36799 from cachedout/carbon_develop 
Carbon -> develop merge fwd
 2016-10-06 20:18:52 +09:00
Mike Place
f3ee19d999 Merge pull request #36800 from Firm/patch-1 
Detect KVM on Proxmox
 2016-10-06 20:18:25 +09:00
Mike Place
b75130be2d Merge pull request #36803 from gtmanfred/2016.3 
do not load libvirt pillar if certtool is unavailable
 2016-10-06 20:15:14 +09:00