Nitin Madhok
|
c299f4119a
|
Adding pillar to toctree
|
2014-12-08 10:52:38 -05:00 |
|
Nitin Madhok
|
f168af05ef
|
Adding state to toctree
|
2014-12-08 10:50:09 -05:00 |
|
Nitin Madhok
|
67fd828708
|
Adding modules to toctree
|
2014-12-08 10:34:33 -05:00 |
|
Colton Myers
|
472f6577e2
|
Merge branch '2014.7' into merge-forward
Conflicts:
salt/minion.py
salt/modules/localemod.py
salt/states/mount.py
salt/transport/__init__.py
salt/utils/schedule.py
|
2014-12-04 11:11:11 -07:00 |
|
Thomas S Hatch
|
1bfed11756
|
Merge pull request #18541 from cachedout/event_return
Event return
|
2014-12-03 09:56:33 -07:00 |
|
Seth House
|
54d8760d2d
|
Added docs for the state-level aggregate keyword
Also added clarification on the two ways to invoke the aggregation
function.
|
2014-12-02 18:33:10 -05:00 |
|
Pedro Algarvio
|
50105aa001
|
Merge branch '2014.7' into develop
Conflicts:
salt/modules/boto_secgroup.py
salt/modules/boto_vpc.py
tests/unit/modules/boto_vpc_test.py
|
2014-12-01 23:07:39 +00:00 |
|
Elias Probst
|
6a7662c498
|
Fix typo (agregate → aggregate).
|
2014-11-29 15:58:07 +01:00 |
|
Mike Place
|
8297c2c48e
|
Documentation
|
2014-11-26 16:56:45 -07:00 |
|
Thomas S Hatch
|
2e3089410a
|
Merge pull request #18514 from cachedout/issue_16879
Update docs for unless
|
2014-11-26 09:29:24 -07:00 |
|
Thomas S Hatch
|
6aa5b0f858
|
Merge branch '2014.7' into develop
Conflicts:
salt/modules/genesis.py
salt/modules/parted.py
salt/modules/win_service.py
salt/runner.py
salt/states/file.py
tests/integration/netapi/rest_tornado/test_app.py
|
2014-11-26 09:24:24 -07:00 |
|
Mike Place
|
988b8e621d
|
Update docs for unless
Note that unless is run for each associate state dec.
|
2014-11-26 09:17:14 -07:00 |
|
rallytime
|
73f3c0091d
|
Clean up doc build so it doesn't stacktrace
Fixes #18471
- Add zmq.eventloop to mocked modules in doc/conf.py
- Cleaned up rst references in rest_tornado.rst
|
2014-11-25 15:11:15 -07:00 |
|
Nitin Madhok
|
93700aa642
|
Fixing sphinx errors and violations
|
2014-11-25 15:01:30 -05:00 |
|
Konrad Starzyk
|
0759323c99
|
Merge remote-tracking branch 'upstream/develop' into jboss7
|
2014-11-25 11:52:27 +01:00 |
|
Colton Myers
|
754baafcf7
|
Merge branch '2014.7' into develop
|
2014-11-24 14:38:46 -07:00 |
|
Colton Myers
|
42223567b8
|
Add warning to docs about topfile compilation
Ref #12483
|
2014-11-24 14:33:37 -07:00 |
|
Konrad Starzyk
|
99406c2215
|
Merge remote-tracking branch 'upstream/develop' into jboss7
|
2014-11-20 11:20:41 +01:00 |
|
starzyk1
|
8101b2a8e7
|
Documentation fixes for jboss7 and artifactory states/modules
|
2014-11-20 11:16:57 +01:00 |
|
pengyao
|
3ffa0dfc6b
|
Url should be '/keys'
|
2014-11-20 11:16:58 +08:00 |
|
Colton Myers
|
716a7e3331
|
Merge branch '2014.7' into merge-forward
Conflicts:
salt/modules/bsd_shadow.py
salt/modules/freebsdjail.py
salt/modules/yumpkg.py
salt/modules/zfs.py
salt/modules/zypper.py
salt/netapi/rest_tornado/saltnado.py
salt/states/dockerio.py
|
2014-11-18 12:46:29 -07:00 |
|
Nitin Madhok
|
5d8ae4e32f
|
Fixing sphinx violations and errors
|
2014-11-18 02:53:40 -05:00 |
|
Colton Myers
|
b2a2facb27
|
Add one additional folder and clarification to client_acl docs
|
2014-11-17 14:55:08 -07:00 |
|
Thomas Jackson
|
6d2fbc8715
|
Documentation for saltnado
|
2014-11-13 08:36:29 -08:00 |
|
Chris Martin
|
d03a2bf753
|
Remove an awkward comma splice in the docs.
|
2014-11-10 20:02:02 -08:00 |
|
Thomas S Hatch
|
b3d2edc9a5
|
Merge branch '2014.7' into develop
|
2014-11-04 15:11:23 -07:00 |
|
Colton Myers
|
df0547969f
|
We evaluate a prereq, we don't call it. Fixes #17086
|
2014-11-04 11:36:30 -07:00 |
|
Henrik Holmboe
|
1f3ba9ced5
|
Add possible values to arguments in Salt man-page
|
2014-11-03 21:27:14 +01:00 |
|
Henrik Holmboe
|
d3da8549a2
|
Typo jod -> job
|
2014-11-03 21:26:28 +01:00 |
|
Henrik Holmboe
|
878a227837
|
Choose vs chose typo
|
2014-11-03 20:54:39 +01:00 |
|
Seth House
|
aff7ab3f43
|
Merge remote-tracking branch 'upstream/2014.7' into develop
|
2014-10-29 16:47:23 -05:00 |
|
Seth House
|
9da07584e4
|
Added missing docs for the /key rest_cherrypy entry point
Should have been part of #16706.
|
2014-10-29 16:35:04 -05:00 |
|
vs
|
7d84f116e3
|
fix formatting
|
2014-10-29 14:37:18 +01:00 |
|
vs
|
4beb56bdbb
|
add wheel.minions to wheel-index
|
2014-10-29 14:35:13 +01:00 |
|
vs
|
9e63712488
|
add documentation for wheel.minions
|
2014-10-29 14:18:23 +01:00 |
|
Colton Myers
|
945e6506b6
|
Merge branch '2014.7' into develop
|
2014-10-27 15:32:25 -06:00 |
|
Colton Myers
|
6da0967805
|
Fix pre-required vs pre-requiring mixups in prereq doc
|
2014-10-27 10:59:07 -06:00 |
|
rallytime
|
933be7c476
|
Merge branch '2014.7' into develop
Conflicts:
salt/master.py
salt/returners/mysql.py
salt/utils/cloud.py
salt/utils/minions.py
|
2014-10-25 08:54:42 -06:00 |
|
vs
|
692252f41b
|
Merge branch 'sreq_cache_option' into optional_sreq_caching
|
2014-10-23 15:55:26 +02:00 |
|
Thomas S Hatch
|
cb14a8660e
|
fix docs for mod_aggregate per #16575
|
2014-10-21 16:37:34 -06:00 |
|
Thomas S Hatch
|
3cf0cfb61d
|
Merge branch '2014.7' into develop
|
2014-10-20 09:20:37 -06:00 |
|
Erik Johnson
|
13a92bde69
|
Add further clarification that gitfs auth is pygit2-only
|
2014-10-19 17:01:13 -05:00 |
|
Pedro Algarvio
|
229eb00e8d
|
Merge branch '2014.7' forward into develop
Conflicts fixed.
Conflicts:
salt/loader.py
salt/returners/carbon_return.py
salt/returners/couchbase_return.py
salt/returners/couchdb_return.py
salt/returners/elasticsearch_return.py
salt/returners/local_cache.py
salt/returners/memcache_return.py
salt/returners/mongo_future_return.py
salt/returners/mongo_return.py
salt/returners/mysql.py
salt/returners/odbc.py
salt/returners/postgres.py
salt/returners/redis_return.py
salt/returners/smtp_return.py
salt/returners/sqlite3_return.py
salt/states/dockerio.py
salt/utils/minions.py
|
2014-10-19 18:21:19 +01:00 |
|
vs
|
2e1d3b07b8
|
add cache_sreqs option to minion documentation
|
2014-10-16 07:33:37 +02:00 |
|
Erik Johnson
|
49c7e6ac1a
|
Fix misspelled code-block type
|
2014-10-15 22:44:27 -05:00 |
|
Erik Johnson
|
bb6de490ef
|
Grammar correction
|
2014-10-15 22:36:12 -05:00 |
|
Mike Place
|
d0e90c77a6
|
Typo fix
|
2014-10-14 13:18:54 -06:00 |
|
Mike Place
|
0fcc0b5ae7
|
Document pillar ovewrite strategy
|
2014-10-14 13:07:26 -06:00 |
|
Thomas S Hatch
|
1468c26ec1
|
Merge branch '2014.7' into develop
Conflicts:
doc/faq.rst
doc/ref/configuration/minion.rst
salt/minion.py
salt/states/pkg.py
salt/transport/__init__.py
|
2014-10-13 15:03:33 -06:00 |
|
Joseph Hall
|
130e0842c8
|
Merge pull request #16566 from terminalmage/docs
Minor wording fix in highstate docs
|
2014-10-11 06:34:39 -06:00 |
|