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
67,148 Commits 24 Branches 182 Tags 341 MiB
48a787bdb0
Commit Graph

5687 Commits

Author SHA1 Message Date
rallytime
7476076ea3 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/beacons/memusage.py
 2016-03-07 14:13:14 -07:00
Imran Iqbal
1f0b742052 Fix typo in example for section winrepo_dir_ng 2016-03-04 22:19:25 +00:00
Jorge Schrauwen
9aa0f72cad Add some info about massive improvements for SmartOS, illumos, and Solaris 2016-03-03 20:23:38 +00:00
Mike Place
a43e5edc81 Merge pull request #31601 from cro/cfgmgmtcamp 
Proxy fixes for #31585 and #31586
 2016-03-03 11:34:07 -07:00
rallytime
2ee175c6d3 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/modules/glusterfs.py
 2016-03-02 13:48:11 -07:00
C. R. Oldham
1ce9d85dd4 Proxy minion release notes. 2016-03-02 11:26:56 -07:00
rallytime
5a862d3449 Add documentation for the behavior change in #31577 
Refs #31577
 2016-03-02 11:03:49 -07:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
 2016-03-02 10:26:13 -07:00
Denys Havrysh
aebc48163d Remove trailing white spaces in documentation files 2016-03-01 17:36:23 +02:00
rallytime
24505d2dcf Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/client/ssh/state.py
  - salt/fileclient.py
  - salt/minion.py
 2016-02-29 10:47:40 -07:00
Mike Place
f2e2e6e3cf Merge pull request #31316 from kraney/kraney_bugfix 
Let ext_pillar_first determine the override order
 2016-02-29 09:09:35 -07:00
Mike Place
95af21325f Merge pull request #31536 from virtrnd/remove-jessie-backports-from-raspbian-install 
Remove debian repo from raspbian installation
 2016-02-29 08:32:52 -07:00
virtualguy
e48900ac55 Use python-tornado from jessie-backports for pure debian 2016-02-29 22:42:15 +13:00
virtualguy
6e338e2601 Remove debian repo from raspbian installation 
Binary packages from stock debain repo (http://httpredir.debian.org/debian) are not armv6 compatible so should not be installed on raspberry pi version 1. Rasbian doesn't have jessie-backports so safer just to install python-tornado from stretch.
 2016-02-29 19:20:51 +13:00
LoveIsGrief
0eba4cdf17 Public documentation for salt-cloud virtualbox 2016-02-28 17:29:02 +01:00
Denys Havrysh
f7beeb69f2 Correct Salt Cloud documentation about updating Salt Bootstrap script 2016-02-27 22:43:07 +02:00
Kris Raney
0aa6334442 Merge branch 'develop' into kraney_bugfix 
Conflicts:
	salt/pillar/__init__.py
 2016-02-26 09:41:09 -06:00
Mike Place
a4482c000f Merge pull request #31492 from m03/add-source_hash-to-win_pkg 
Add source_hash param to win_pkg
 2016-02-26 08:06:27 -07:00
Denys Havrysh
50f3e072b1 Add instruction how to install salt-minion on Debian Jessie from Stretch 2016-02-26 15:10:37 +02:00
Denys Havrysh
abcd505178 Update Debian installation guide with information about Raspbian 2016-02-26 13:30:22 +02:00
rallytime
40cd0ac8fe Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/file.py
  - tests/runtests.py
 2016-02-25 16:21:15 -07:00
rallytime
83e6480d20 Remove duplicate "timeout" definition in Roster docs 2016-02-25 14:05:38 -07:00
rallytime
3b74d123af Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/selinux.py
  - salt/modules/zypper.py
  - salt/pillar/__init__.py
  - salt/states/dockerng.py
  - tests/runtests.py
 2016-02-25 12:36:22 -07:00
Morrie Winnett
8690188558 Add source_hash param to win_pkg 
Addresses issues saltstack/salt#14872, saltstack/salt-winrepo#492, and
concerns raised in saltstack/salt#27093 and saltstack/salt#20737.
 2016-02-25 09:47:52 -08:00
Nicole Thomas
cd87760c87 Merge pull request #31485 from jacobhammons/2015.8 
Fixed transport description in minion / master config
 2016-02-25 10:04:15 -07:00
Jacob Hammons
748acab8b5 Fixed zeromq casing in transport settings 2016-02-25 09:38:41 -07:00
Kris Raney
afa297e4d1 Add pillar_roots_override_ext_pillar option and deprecate ext_pillar_first 2016-02-25 10:17:39 -06:00
Mike Place
e483978fc8 Merge pull request #31423 from twangboy/win_system_dev 
Fix uppercase computer names
 2016-02-25 09:15:58 -07:00
Jacob Hammons
765a226907 Fixed transport description in minion / master config 2016-02-25 09:08:54 -07:00
Nicole Thomas
2e9a705e75 Merge pull request #31475 from jacobhammons/2015.8 
Assorted doc issues
 2016-02-25 09:03:54 -07:00
Denys Havrysh
172f34a6ca Correct headers in Debian/Ubuntu/SUSE install instructions 2016-02-25 11:51:40 +02:00
Denys Havrysh
4248f9ea0a Add common packages installation section to Debian install guide 2016-02-25 11:04:11 +02:00
Denys Havrysh
8c6e179870 Add note about amd64 packages to Ubuntu install guide 2016-02-25 11:02:07 +02:00
Denys Havrysh
afaa24723a Update Ubuntu install guide: 
- remove duplicate sections
- add `salt-api` and `salt-cloud` to the example
 2016-02-25 10:24:55 +02:00
Jacob Hammons
a72dc15720 Assorted doc issues 
Fixes #10330
Fixes #31216
Fixes #30464
Fixes #29520
Fixes #30261
Fixes #29636
Fixes #29528
 2016-02-24 16:56:52 -07:00
twangboy
36f63965ed Add release notes. 2016-02-24 11:41:44 -07:00
Jacob Hammons
10bf7c3bdd Fixes #31402 
Added arguments to state `file.line` to fix issue where exe module uses `line` and state module uses `name`.
Reformatted parameters in exe module `file.line`
placeholder release notes for 2015.5.8
 2016-02-24 10:30:34 -07:00
twangboy
eb457b9eb8 Fix typos 2016-02-24 10:15:01 -07:00
twangboy
78535f7306 Fix some formatting issues 2016-02-24 10:08:03 -07:00
twangboy
b0f2d3d9f6 Clarification for Windows Package Manger 
Formatting issues
 2016-02-24 10:08:03 -07:00
Mike Place
aa0a9a03dd Merge pull request #31458 from vutny/correct-doc-install-debian 
Correct installation documentation for Debian
 2016-02-24 10:01:09 -07:00
Denys Havrysh
42aa7eeafd Add section about installation from the Debian Main Repository 2016-02-24 17:48:37 +02:00
Kyle Stapp
87f4843490 Clarified the form of requisite targets/requisite-references 2016-02-24 10:34:03 -05:00
Denys Havrysh
07dece2f8f Remove duplicate post-installation section for Debian install guide 2016-02-24 17:30:51 +02:00
Nicole Thomas
b32dd6d332 Merge pull request #31452 from anandxoriant/develop 
Updated win_organization_name default value for vmware driver
 2016-02-24 08:27:27 -07:00
Denys Havrysh
10c05f6943 Add install section for Debian Stretch (Testing) from community repository 2016-02-24 17:26:20 +02:00
Denys Havrysh
b2c78e08dc Add note about supported Debian architectures on SaltStack corp repo 2016-02-24 17:24:44 +02:00
Anand Nevase
a93c7e2ffa change win_organization_name default value to Organization 2016-02-24 17:34:07 +05:30
Nicole Thomas
8f6c4be618 Merge pull request #31444 from jacobhammons/ddns-docs 
Documentation updates - ddns state, file.line state/exe function, installation dependencies
 2016-02-23 15:40:05 -07:00
Jacob Hammons
0b8fce1de4 Fixes #31402 
Added arguments to state `file.line` to fix issue where exe module uses `line` and state module uses `name`.
Reformatted parameters in exe module `file.line`
placeholder release notes for 2015.5.8
 2016-02-23 14:28:40 -07:00