Commit Graph

5324 Commits

Author SHA1 Message Date
Josh Fraser
26eee1505f There were two identical blocks concerning Windows Deploy Timeouts. This
pull request removes the extra block of text.
2016-03-21 09:08:21 -06:00
Jacob Hammons
31bb573abc Fixes a doc build exception caused by missing mocks for modules.win_dacl 2016-03-18 17:43:36 -06:00
Justin Findlay
b984659678 update 2015.8.8 release notes 2016-03-17 15:07:10 -06:00
rallytime
06dd2c0411 Fix linking syntax in testing docs 2016-03-16 16:43:53 -06:00
Justin Findlay
64dd8aebb2 update 2015.8.8 release notes 2016-03-16 11:49:01 -06:00
rallytime
1a1ce05186 Merge branch '2015.5' into '2015.8'
Conflicts:
  - .testing.pylintrc
  - salt/cloud/clouds/joyent.py
2016-03-15 12:34:57 -06:00
Sandor Zeestraten
a1a2229405 Adds missing docs for Azure cloud profile
Adds documentation for feature introduced in #24559 in salt-cloud
to specify virtual network and subnet in the Azure cloud profile.
2016-03-13 14:27:49 +01:00
rallytime
1470de17fa Merge branch '2014.7' into '2015.5' 2016-03-12 19:08:20 -07:00
Justin Findlay
47ac41ba27 add 2015.8.8 release notes 2016-03-11 16:14:54 -07:00
Justin Findlay
358fdad0c8 add 2014.7.8 release notes 2016-03-11 14:31:51 -07:00
Justin Findlay
6910fcc584 add 2014.7.9 release notes 2016-03-11 14:08:55 -07:00
Nicole Thomas
8cf0b9eb3d Merge pull request #31810 from whiteinge/saltenv-jinja-var
Fix outdated Jinja 'env' variable reference
2016-03-10 20:52:21 -07:00
Seth House
cb72b19240 Fix outdated Jinja 'env' variable reference 2016-03-10 19:48:42 -07:00
Nicole Thomas
1d6d982e5c Merge pull request #31752 from rallytime/bp-31686
Back-port #31686 to 2015.8
2016-03-09 14:23:00 -07:00
Nicole Thomas
ec90294442 Merge pull request #31733 from jacobhammons/cloud-docs
docs to clarify cloud configuration
2016-03-09 13:54:10 -07:00
Jacob Hammons
209c641a41 Made udpates as suggested by @rallytime 2016-03-09 11:00:27 -07:00
Imran Iqbal
e4df5d9a55 Fix typo in example for section winrepo_dir_ng 2016-03-08 13:21:52 -07:00
Vincas Dargis
26ff46dbc6 Fix parenthesis missmatch in documentation 2016-03-08 10:18:47 +02:00
Jacob Hammons
26d4991cb3 moved previous intro to new quick start topic (topics/cloud/qs.rst)
added new intro that explains the salt cloud configuration files
added an inheritance and minion startup state example to topics/cloud/config.rst
2016-03-07 16:06:16 -07:00
Mike Place
a1f32b71bd Merge pull request #31670 from terminalmage/issue30528
Write lists of minions targeted by syndic masters to job cache
2016-03-07 11:51:52 -07:00
rallytime
6559ea15b0 Merge branch '2015.5' into '2015.8'
Conflicts:
  - doc/glossary.rst
  - salt/config.py
  - tests/unit/modules/gpg_test.py
2016-03-06 10:59:46 -07:00
Nicole Thomas
27f443895d Merge pull request #31682 from cachedout/cache_meaning
Add definition of job cache to glossary
2016-03-04 13:07:19 -07:00
Mike Place
a75e146125 Add definition of job cache to glossary 2016-03-04 12:41:02 -07:00
rallytime
beb9d0fe84 Ensure all integration test classes and funcs are documented w/examples 2016-03-04 12:13:27 -07:00
rallytime
7f8ebf7c97 Found another spelling error 2016-03-04 09:53:35 -07:00
rallytime
c8c188535f Spelling fix 2016-03-04 09:33:37 -07:00
Erik Johnson
0f175a4edf salt.returners.sqlite3_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
f8664103b1 salt.returners.redis_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
0ea1b76c22 salt.returners.postgres_local_cache: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
d6d794b484 salt.returners.postgres: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
82750ab699 salt.returners.pgjsonb: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
d8f90f6578 salt.returners.odbc: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
a1957c3706 salt.returners.mysql: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
ef6aa5de1c salt.returners.multi_returner: add no-op save_minions() func for API compatibility 2016-03-03 21:40:37 -06:00
Erik Johnson
5b4eb58d99 salt.returners.mongo_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
da1acbb8f2 salt.returners.mongo_future_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
c13bb6549c salt.returners.memcache_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
4322ad9ef3 salt.returners.influxdb_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
1dd106183c salt.returners.etcd_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
8e80535516 salt.returners.couchdb_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
44538dfced salt.returners.cassandra_cql_return: add no-op save_minions() func for API compatibility 2016-03-03 21:40:36 -06:00
Erik Johnson
978b6cb32f Add missing RST file for slsutil module 2016-03-03 21:40:36 -06:00
rallytime
f260c51762 Some more testing documentation improvements 2016-03-03 16:57:52 -07:00
Mike Place
bd04c964d1 Merge pull request #31658 from rallytime/add-style-to-contrib
Add mentioned of Salt's Coding Style docs to the Contributing docs
2016-03-03 15:14:57 -07:00
rallytime
6b526b5878 Add mentioned of Salt's Coding Style docs to the Contributing docs 2016-03-03 11:41:46 -07:00
rallytime
6e0377d376 Make note of pylint dependencies in docs 2016-03-03 10:56:22 -07:00
Mike Place
4d1701de60 Merge pull request #31641 from rallytime/testing-tutorial
Improve Salt Testing tutorial to be a more comprehensive intro
2016-03-03 09:08:47 -07:00
rallytime
6ab3961748 Improve Salt Testing tutorial to be a more comprehensive intro 2016-03-02 17:07:57 -07:00
rallytime
75bb692990 Merge branch '2015.5' into '2015.8'
No conflicts.
2016-03-02 12:33:10 -07:00
Justin Findlay
4e48fec806 doc/topics/tutorials/http: update query decoding docs
Fixes #31614.
2016-03-02 10:17:22 -07:00