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

7306 Commits

Author SHA1 Message Date
twangboy
d67c1dfbf7 Remove references to salt master installation 2017-06-13 15:02:44 -06:00
rallytime
bdf33d7f5f Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-06-13 09:26:05 -06:00
rallytime
5150916556 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/parted.py
 2017-06-12 20:10:45 -06:00
Erik Johnson
6ec9dfb7f3 Update version in master-tops docs 
This paragraphs is referring to #37322, which was pushed to Oxygen.
 2017-06-12 17:20:09 -05:00
rallytime
c91ca5f809 Remove note about version incompatibility with salt-cloud 
The note references very old versions of salt + salt-cloud and since
salt-cloud has been incorporated into salt for quite some time, this
notice is no longer needed.
 2017-06-12 11:16:52 -06:00
Mike Place
94aa1876d4 Merge pull request #41546 from cloudflare/dns-grains 
Add host_dns grain for napalm
 2017-06-06 15:00:07 -05:00
Mircea Ulinic
564f2d1e3d Indent correctly the code block 2017-06-06 15:23:14 +00:00
Mircea Ulinic
b70df6e576 Reference new Jinja filters in the release notes 2017-06-06 15:15:06 +00:00
Mircea Ulinic
406e582479 Small adjustment 2017-06-06 15:14:47 +00:00
Mircea Ulinic
62cb2a1c7a More jinja references 2017-06-06 15:05:50 +00:00
Mircea Ulinic
bba8c27873 Restructure the Jinja topic to have refrences 2017-06-06 14:56:21 +00:00
Mircea Ulinic
2a8c5cef04 Add notes regarding other new features 2017-06-06 14:18:01 +00:00
Mircea Ulinic
b59760fae2 Fix indentation for better display 2017-06-06 13:52:01 +00:00
Mircea Ulinic
ad4e6e5ec5 salt.beacons.log instead of 'Log' 2017-06-06 13:46:38 +00:00
Mircea Ulinic
36985bb1ed Remove service state, not a new one 2017-06-06 13:45:02 +00:00
Mircea Ulinic
b6b6a51846 Index new modules introduced in Nitrogen 2017-06-06 13:41:32 +00:00
Mircea Ulinic
6b1b05129c Remove the reference to the profile outputter 2017-06-06 12:49:04 +00:00
Mircea Ulinic
fb12353a1d Insert note in the Nitrogen release 2017-06-01 11:42:53 +00:00
Mike Place
cec5af7ce3 Merge pull request #41437 from Ch3LL/fix_gce_net 
Remove ex_subnetwork requirement for GCE
 2017-05-26 17:04:06 -05:00
rallytime
de85b49b90 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/config/__init__.py
  - salt/modules/cp.py
  - salt/states/saltmod.py
  - salt/utils/__init__.py
  - salt/utils/gzip_util.py
  - tests/integration/shell/test_cp.py
 2017-05-26 11:11:54 -06:00
Nicole Thomas
5bb9dac9ec Merge pull request #41413 from gtmanfred/nitrogen 
Write tests for Venafi runner
 2017-05-26 10:09:23 -06:00
Nicole Thomas
824f2d3b69 Merge pull request #41398 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-05-26 09:17:48 -06:00
Ch3LL
3f94964801
Remove ex_subnetwork requirement for GCE 2017-05-25 16:25:12 -04:00
Daniel Wallace
6dfb63f15d add venafi to table of contents 2017-05-25 10:27:40 -06:00
Daniel Wallace
343a0b206c fix doc 2017-05-25 10:26:54 -06:00
wgoulet
44dec966c8 Updated documentation for Venafi module with better examples & clarifications 2017-05-25 10:26:54 -06:00
David Boucha
5eb27571a0 Correct doc to actually blacklist a module 2017-05-24 17:22:36 -06:00
rallytime
9ff2694155 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - pkg/salt-minion.service
  - salt/modules/junos.py
  - salt/modules/localemod.py
  - salt/modules/win_system.py
  - salt/states/junos.py
  - tests/unit/modules/test_localemod.py
  - tests/unit/modules/test_win_powercfg.py
  - tests/unit/states/dockerng_test.py
 2017-05-24 16:32:59 -06:00
Benjamin Drung
33a7f8b2ec Fix typos 
lintian found several spelling errors.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2017-05-24 12:50:29 +02:00
rallytime
d2d9a3d29f Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/cli/salt-cp.rst
  - salt/config/__init__.py
 2017-05-23 15:58:14 -06:00
Ch3LL
0d3f5da0ec add spaces for code in docs 2017-05-23 11:35:20 -06:00
Ch3LL
42e614bb7d add title 2017-05-23 11:35:20 -06:00
Ch3LL
b02ec97cff add ability to expand disk size on creation of vm in nebula 2017-05-23 11:35:20 -06:00
Benjamin Drung
5b79a0a9f8 Do not require sphinx-build for cleaning docs 
In a minimal build environment (no sphinx), the package cannot initially
clean itself because the upstream doc/Makefile checks for sphinx-build
executable and Debian doesn't get any benefit of that.

Thus do not check for the presence of sphinx-build when running the
clean or help target by adding a phony check_sphinx-build that does the
check for sphinx-build.

Debian bug: https://bugs.debian.org/851559
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2017-05-23 17:14:11 +02:00
Mike Place
337d00fbf9 Merge pull request #41352 from whiteinge/rest_cherrypy-cors-token 
rest_cherrypy CORS fix & /token endpoint
 2017-05-22 11:03:04 -05:00
Mike Place
8b45b577a9 Merge pull request #41356 from whiteinge/doc-full_return 
Add full_return to release notes
 2017-05-22 10:56:14 -05:00
Seth House
fa0b1e7d7e Add full_return to release notes 2017-05-21 16:27:40 -06:00
rallytime
c6c1d30c48 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/yumpkg.py
  - salt/spm/__init__.py
  - tests/unit/modules/test_zypper.py
  - tests/unit/utils/test_network.py
 2017-05-20 17:07:34 -06:00
Seth House
f6ae3b4634 Add rest_cherrypy additions to the release notes 2017-05-20 15:59:46 -06:00
Mike Place
6bdb7cca7d Merge pull request #41327 from Ch3LL/add_2016.11.6_release 
Add 2016.11.6 Release Notes
 2017-05-19 13:05:08 -05:00
Mike Place
6ca65592da Merge pull request #41322 from Ch3LL/fix_release_2016.11.5_notes 
Add patched packages warning to 2016.11.5 release notes
 2017-05-18 16:53:25 -05:00
Ch3LL
e5fc0aeb9c
Add 2016.11.6 Release Notes 2017-05-18 14:17:35 -04:00
Ch3LL
9a1bf4205f
fix url refs in rst 2017-05-18 12:42:35 -04:00
Ch3LL
cde008ff77
Add patched packages warning to 2016.11.5 release notes 2017-05-18 12:24:53 -04:00
Ch3LL
520740d862
[2016.13] Bump latest release version to 2016.11.5 2017-05-18 09:40:08 -04:00
Ch3LL
cdb072c207
[2016.11] Bump latest release version to 2016.11.5 2017-05-18 09:39:04 -04:00
Mike Place
051259d469 Merge pull request #41218 from gtmanfred/roster 
allow for syncing salt-ssh rosters on the master
 2017-05-17 14:21:25 -05:00
Evgeny Akhmetkhanov
76104f23b4 Add basic auth for SPM 2017-05-14 15:32:55 +03:00
Erik Johnson
10dc695cc4 Make salt-cp work with larger files 
This breaks the files into chunks to keep them from exceeding the max size
of a published command. It also adds recursion, allowing for entire
directories to be transmitted. Finally, it adds gzip compression, and
a "-n" flag to disable use of compression.
 2017-05-12 15:13:28 -05:00
Daniel Wallace
836ee32ff6 allow for syncing salt-ssh rosters on the master 2017-05-12 13:36:46 -06:00