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
78,714 Commits 24 Branches 182 Tags 341 MiB
cfeda912f6
Commit Graph

1087 Commits

Author SHA1 Message Date
Mike Place
cfeda912f6 Merge pull request #39629 from terminalmage/pr-34327 
Implement git_pillar mountpoints
 2017-02-24 16:30:32 -07:00
Erik Johnson
f6b9152a9e Add no_block feature to Nitrogen release notes 2017-02-24 15:14:09 -06:00
Erik Johnson
9a2193e8f2 Add git_pillar mountpoints feature to Nitrogen release notes 2017-02-24 10:37:28 -06:00
rallytime
c46f82c029 Merge branch '2016.11' into 'develop' 
Conflicts:
  - requirements/dev_python27.txt
  - requirements/dev_python34.txt
 2017-02-21 14:20:20 -07:00
Erik Johnson
c673d06f48 Rename dockerng state/execution module to docker 2017-02-18 21:58:25 -06:00
rallytime
dda39d4e63 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/grains.py
  - salt/utils/gitfs.py
 2017-02-16 12:18:46 -07:00
rallytime
e698bc3508 Fix more warnings in doc build 2017-02-16 11:20:35 -07:00
Megan Wilhite
1acf00da3b add 2016.11.3 changelog to release notes (#39451) 2017-02-16 10:49:53 -07:00
Daniel Wallace
3172e88700 Add release notes for cisco proxy minions added in Carbon 2017-02-16 10:05:33 -06:00
markuskramerIgitt
2a40840421 rst table requires + signs for column 2017-02-10 12:33:57 +01:00
markuskramerIgitt
7e25c637d9 wrong git branch 2017-02-10 12:29:13 +01:00
markuskramerIgitt
96958f4706 Merge branch 'develop' of https://github.com/saltstack/salt into develop 2017-02-10 12:24:20 +01:00
markuskramerIgitt
6f165a954a rst table requires + signs for column 2017-02-10 12:20:34 +01:00
Mike Place
1d813bd902 Merge pull request #39283 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-02-09 15:10:03 -07:00
Mike Place
5caa083024 Merge pull request #39250 from Juniper/develop 
junos specific changes to add more feature and enhancements to our APIs
 2017-02-09 14:49:09 -07:00
rallytime
609e6e4b23 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/config/__init__.py
  - salt/modules/win_lgpo.py
  - salt/utils/aws.py
  - tests/unit/utils/schema_test.py
 2017-02-09 10:29:40 -07:00
Erik Johnson
d35c2f810c salt.utils.gitfs: remove dulwich support, make refspecs configurable (#39210) 
* Add config params for custom refspecs

* Add exceptions for errors encountered modifying git config

* Make the refspecs a configurable parameter

* Make refspecs a per-remote parameter

* Update master config template to include custom refspecs opts

* Add documentation for new config params

* Update GitFS walkthrough with a section on custom refspecs

* Remove dulwich support from salt.utils.gitfs

Dulwich still lacks important features, including (but not limited to)
the following:

- Lack of the necessary support for checking out a ref needed for
  git_pillar/winrepo support

- No support in its config objects for multivar git config items, making
  it impossible to detect when repos have multiple refspecs set for a
  given git remote

Given this information, and the fact that it trails as a distant third
to Pygit2 and GitPython, Salt will cease to support Dulwich as a git
interface moving forward.

* Excise references to dulwich from documentation

* Add mention of custom refspecs to Nitrogen release notes

* Add gitfs_refspecs to mocked opts in gitfs integration tests

Also remove dulwich from unit tests

* Add information about opts argument not being intended for CLI use
 2017-02-09 09:50:45 -07:00
vnitinv
3d9dd685f5 Merge remote-tracking branch 'upstream/develop' into develop 2017-02-08 23:06:48 +05:30
Mike Place
0f838b2b12 Merge pull request #38621 from terminalmage/pr34442 
Add support for wildcard versions in pkg.installed states
 2017-02-07 14:41:14 -07:00
Erik Johnson
18729f3713 Add wildcard versions to Nitrogen release notes 2017-02-07 08:54:26 -06:00
vnitinv
e48fff4192 Merge remote-tracking branch 'upstream/develop' into develop 2017-02-07 11:27:43 +05:30
Nitin Kumar
49b9f00643 Merge branch 'develop' into develop 2017-02-07 11:14:25 +05:30
rallytime
2f74dcf685 Various doc updates to fix warnings in doc build 2017-02-06 16:56:58 -07:00
Mike Place
f8d79076f2 Merge pull request #39013 from terminalmage/zh878 
Decryption of values in Pillar SLS files
 2017-02-06 12:08:57 -07:00
Erik Johnson
aa6bd51b6b Add Pillar Decryption info to Nitrogen release notes 2017-01-31 11:25:58 -06:00
rallytime
0e5fa1b8ae Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/vsphere.py
 2017-01-31 08:57:44 -07:00
rallytime
b2b3989773 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/engines/__init__.py
  - salt/loader.py
 2017-01-30 16:58:31 -07:00
rallytime
b732a1f646 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2017-01-30 16:45:16 -07:00
Nicole Thomas
56ccae6ff7 Add 2015.8.14 release notes file (#39046) 2017-01-30 16:44:00 -07:00
Nicole Thomas
fef1b1133d Add 2016.3.6 release notes file (#39045) 2017-01-30 16:43:50 -07:00
Nicole Thomas
0943872fab Add 2016.11.3 release notes file (#39044) 2017-01-30 16:43:40 -07:00
Nicole Thomas
424e68436e Update 2016.11.2 release notes (#39039) 2017-01-30 15:40:00 -07:00
Nicole Thomas
ff324599d5 Update 2016.3.5 release notes (#39038) 2017-01-30 15:39:47 -07:00
Nicole Thomas
5943fe65d3 Update 2015.8.13 release notes (#39037) 2017-01-30 15:39:33 -07:00
Julien BONACHERA
1e06f388bb make openvswitch state work with python3 (#38873) 
* openvswitch: add a basic unit test for openvswitch

* openvswitch: enclose comments_* variables into a map

* openvswitch: only prepare error messages if type parameter is present

* openvswitch: add test case: create a GRE port

* openvswitch: remove trailing whitespace

* openvswitch: add missing "comments" variable

* openvswitch: pep8 compliance

* openvswitch: mock dig.check_ip

* openvswitch: rename "type" argument into "tunnel_type"

* openvswitch: reference bridge_exists before assignment

* openvswitch: reference port_list before assignment

* openvswitch: add upgrade note about "type" option renaming
 2017-01-30 09:56:10 -07:00
Jason Pack
cb44161eb6 Merge branch 'develop' of https://github.com/spidercensus/salt into develop 
Conflict was salt/proxy/junos.py
 2017-01-27 09:52:42 -05:00
Jason Pack
45268d6d56 Merge branch 'patch-2' of https://github.com/spidercensus/salt into develop 2017-01-27 09:46:55 -05:00
rallytime
e91fcbeaac Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/minion.py
  - salt/modules/dockerng.py
  - salt/thorium/key.py
 2017-01-26 16:02:06 -07:00
Mike Place
664748e959 Add documentation release note for change in system module (#38975) 
Refs #38968
 2017-01-26 12:09:17 -07:00
Markus
7ff098426d comments on version number and git (#38961) 2017-01-26 09:21:16 -07:00
rallytime
49f57ba3f1 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/utils/win_functions.py
 2017-01-25 09:59:29 -07:00
rallytime
ee33a53a64 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/dockerng.py
  - tests/unit/doc_test.py
 2017-01-25 09:43:12 -07:00
Megan Wilhite
2786e209c6 add 2016.11.2 changelog to release notes (#38848) 2017-01-20 15:32:45 -07:00
Ch3LL
31f324c4ff add 2016.3.5 changelog to release notes 2017-01-19 15:43:28 -07:00
rallytime
5b43a252c9 Merge branch '2016.11' into 'develop' 
Conflicts:
  - conf/master
  - doc/topics/installation/ubuntu.rst
  - salt/modules/pillar.py
  - salt/netapi/rest_tornado/saltnado.py
  - salt/states/influxdb_user.py
  - salt/utils/minions.py
  - salt/utils/openstack/nova.py
 2017-01-17 09:50:06 -07:00
rallytime
30e8a66fb0 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
  - tests/integration/netapi/rest_tornado/test_app.py
 2017-01-16 18:54:14 -07:00
rallytime
d24776f5e9 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - conf/master
  - doc/topics/netapi/index.rst
  - salt/netapi/__init__.py
 2017-01-15 16:07:55 -07:00
rallytime
b910499dbe Various follow up fixes 
Merge branch '2015.8.12_follow_up' into '2015.8'
 2017-01-13 14:40:17 -07:00
rallytime
e8309a6bbf Add release notes for 2015.8.13 2017-01-09 14:25:31 -07:00
rallytime
87af1f1e5a Remove support for aliasing cmd.run to cmd.shell 2017-01-06 11:46:47 -05:00