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
85,172 Commits 24 Branches 182 Tags 341 MiB
453c3d7f20
Commit Graph

356 Commits

Author SHA1 Message Date
Ch3LL
9c324d3d0c [develop] Bump latest and previous versions 2017-08-15 13:32:01 -04:00
rallytime
56b53c95e3 Fix build_type and release variables for develop branch 
The changes to 2017.7 were merged forward accidentally, in a section
that should have it's own settings. This restores the setting variables
for the develop branch.
 2017-08-09 11:52:15 -04:00
rallytime
1f0b90aa57 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cloud/clouds/joyent.py
  - salt/engines/slack.py
 2017-07-26 17:51:36 -06:00
Ch3LL
3f4a918f73 update windows urls to new py2/py3 naming scheme 2017-07-21 09:45:30 -04:00
Ch3LL
0f48ee8a35 [develop] Update version numbers in doc config for 2017.7.0 release 2017-07-17 16:58:03 -04:00
Ch3LL
dc5bb301f7 [2017.7] Update version numbers in doc config for 2017.7.0 release 2017-07-17 16:56:56 -04:00
rallytime
4d96cc1068 Merge branch '2017.7' into 'develop' 
No conflicts.
 2017-07-03 09:28:18 -06:00
rallytime
c98470e557 Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-06-30 10:00:10 -06:00
Seth House
18dfa9893c Re-add msgpack to mocked imports 2017-06-29 13:49:45 -06:00
Seth House
5592e6e5d4 Revert "Allow docs to be built under Python 3" 2017-06-29 13:32:09 -06:00
Erik Johnson
9a50e7c1ca Merge remote-tracking branch 'upstream/2017.7' into merge-develop 2017-06-28 22:10:50 -05:00
rallytime
7d7be2d375 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - doc/ref/configuration/master.rst
  - tests/integration/states/test_archive.py
  - tests/unit/transport/test_tcp.py
  - tests/unit/transport/test_zeromq.py
 2017-06-28 10:48:37 -06:00
Ch3LL
fe4f5711d5 [2016.11] Bump latest release version to 2016.11.6 2017-06-28 11:24:17 -04:00
Ch3LL
0f5d5667cf [develop] Bump latest release version to 2016.11.6 2017-06-28 11:23:07 -04:00
Mike Place
7aacddf6ef
Allow docs to be built under Python 3 2017-06-27 11:46:47 -06:00
Mike Place
21a1b41a42 Merge pull request #41502 from whiteinge/epub-tocdup 
Add epub_tocdup to conf file
 2017-05-30 12:44:19 -05:00
Seth House
ebefecea33 Add epub_tocdup to conf file 
http://www.sphinx-doc.org/en/stable/config.html#confval-epub_tocdup
 2017-05-30 10:17:52 -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
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
Ch3LL
cdb072c207
[2016.11] Bump latest release version to 2016.11.5 2017-05-18 09:39:04 -04:00
Ch3LL
c18dff225f
[develop] Bump latest release version to 2016.11.5 2017-05-18 09:38:00 -04:00
rallytime
5372f25fde Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/cloud/clouds/rackspace.py
  - tests/unit/cloud/clouds/test_dimensiondata.py
 2017-04-24 15:35:28 -06:00
Ch3LL
b20d878266
[develop] Bump latest release version to 2016.11.3 2017-04-24 13:31:53 -04:00
Ch3LL
e7b604339d
[2016.11] Bump latest release version to 2016.11.4 2017-04-24 13:29:28 -04:00
Ch3LL
7597d96edb [2016.11] Bump previous version to 2016.3.6 2017-03-28 12:39:45 -06:00
Ch3LL
474c62328b Bump previous version to 2016.3.6 2017-03-28 12:37:13 -06:00
rallytime
7cc49adef5 [develop] Bump latest release version to 2016.11.3 2017-02-28 09:03:40 -07:00
rallytime
b5a7111ad9 [2016.11] Bump latest release version to 2016.11.3 2017-02-28 09:03:05 -07:00
rallytime
8edfb82e90 Fix doc build errors in junos_syslog engine 
- Moved the module-level Parser() call to the class level
- Added twisted imports to list of MOCK_MODULES
- Also added msgpack to handle some other errors
 2017-02-03 11:59:47 -07:00
Nicole Thomas
11a99d8be0 [develop] Update release numbers for doc build (#39041) 2017-01-30 15:51:40 -07:00
Nicole Thomas
27081d6520 [2016.11] Update release numbers for doc build (#39040) 2017-01-30 15:51:09 -07:00
rallytime
a2927226ea Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/modules/all/salt.modules.napalm_route.rst
  - doc/ref/modules/all/salt.modules.napalm_snmp.rst
  - doc/ref/modules/all/salt.modules.napalm_users.rst
  - doc/ref/states/all/salt.states.netsnmp.rst
  - doc/ref/states/all/salt.states.netusers.rst
  - salt/states/cron.py
 2016-12-22 12:15:06 -07:00
rallytime
b31c2412ca Add __iter__ and next options to doc/conf.py 
This allows sphinx to build without autodoc errors on mock objects
that should be iterable.

Also added versionadded tags to the snapper module and state.
 2016-12-20 11:50:43 -07:00
Nicole Thomas
2e480cfb77 [develop] Bump latest release version to 2016.11.1 (#38258) 2016-12-14 16:29:02 -07:00
Nicole Thomas
702d46244b [2016.11] Bump latest release version to 2016.11.1 (#38257) 2016-12-14 16:28:39 -07:00
Nicole Thomas
ab071f2636 [develop] Update version numbers in doc config for 2016.11.0 release (#37915) 2016-11-28 10:10:00 -07:00
Nicole Thomas
d204099db8 [2016.11] Update version numbers in doc config for 2016.11.0 release (#37917) 2016-11-28 10:08:52 -07:00
rallytime
5340edb9bb Keep the 'develop' branch setting in doc conf 2016-11-11 09:04:12 -07:00
Nicole Thomas
eea781a9ac Update the docbuild settings for 2016.11 branch (#37606) 2016-11-10 10:47:25 -07:00
rallytime
9b3e4414c8 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - pkg/windows/modules/get-settings.psm1
  - salt/modules/mac_power.py
  - salt/modules/win_dsc.py
  - salt/modules/win_servermanager.py
  - salt/states/file.py
  - salt/utils/event.py
  - salt/utils/gitfs.py
 2016-11-04 15:23:49 -06:00
Nicole Thomas
dfd94959b6 [2016.3] Doc version updated to 2016.3.4 (#37483) 2016-11-04 14:12:19 -06:00
Jacob Hammons
dd21da4992 Add autodoc topics for new modules added in Carbon (#36933) 
Module formatting issues
Add list of new Carbon modules to release notes
 2016-10-12 09:31:07 -06:00
rallytime
ae595537ff Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/pkgng.py
 2016-08-31 16:39:54 -06:00
Jacob Hammons
ac8fe6ff9e Version docs to 2016.3.3 2016-08-31 14:34:55 -06:00
Jacob Hammons
9910b9c6f9 Fix incremental doc builds - OS X, postgres returner, tcp transport doc updates (#35865) 
* Updates doc builds to generate build timestamp only when building for docs.saltstack.com. This re-enables incremental builds.
Adds notes to OS X page that Salt master on OS X is not officially supported
Adds note to postgres returners to cross-link modules with usage explanation (ZD #875)
Adds example showing how to enable tcp transport

* Generate copyright date
Footer updates
 2016-08-31 09:51:36 -06:00
rallytime
3d49f6a58d Add yaml.parser to doc build mocks 2016-08-29 16:41:15 -06:00
rallytime
2b1ad9e9b9 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/utils/gitfs.py
 2016-08-26 14:54:54 -06:00
Jacob Hammons
0247867898 Adds mock for tornado.locks (#35807) 2016-08-26 10:43:34 -06:00
rallytime
6464236f68 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - doc/ref/returners/index.rst
  - salt/states/disk.py
 2016-08-25 16:09:01 -06:00