Commit Graph

283 Commits

Author SHA1 Message Date
Jacob Hammons
f4d869fb0f doc version updated to 2016.3.2 (#35147)
updated the navigation headings
2016-08-02 14:21:52 -06:00
Jacob Hammons
5e2ddb5eb0 Adds a mock required for the network settings beacon 2016-07-12 13:08:46 -06:00
Jacob Hammons
a4b67fd1e9 Updated latest release to 2016.3.1
Clean up installation instructions
code-block type updates
Add link to jinja tutorial
2016-06-15 11:52:02 -06:00
rallytime
19d49d94f2 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-06-13 11:13:38 -06:00
jacobhammons
4a8064918a Adds a "Generated on <timestamp>" line to the footer of each doc html page in the doc (#33962) 2016-06-13 11:24:40 -04:00
Jacob Hammons
42e358af7d Updated version numbers in the docs for the 2016.3.0 release 2016-05-25 18:06:03 -06:00
Jacob Hammons
a424c38f5d New doc site layout, 2016.3.0 release note known issue additions 2016-05-25 17:39:55 -06:00
rallytime
1febb0e13a Merge branch '2015.8' into '2016.3'
No conflicts.
2016-05-20 10:35:25 -06:00
Jacob Hammons
e850c298a9 2015.8.10 release notes 2016-05-20 10:01:32 -06:00
rallytime
35ad788470 Merge branch '2015.8' into '2016.3'
Conflicts:
  - conf/minion
  - doc/ref/configuration/minion.rst
  - salt/modules/boto_elb.py
  - salt/modules/sudo.py
  - salt/states/boto_elb.py
  - salt/transport/zeromq.py
2016-05-19 16:22:36 -06:00
Jacob Hammons
146b4df6be Updates docs version to 2015.8.9
Adds note regarding the os grain on Mint Linux
Adds an FAQ regarding grains that change due to upstream changes
2016-05-19 13:41:35 -06:00
rallytime
c6f18fac3f Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/minion.py
2016-05-10 15:13:24 -06:00
rallytime
c732c8104b Merge branch '2015.5' into '2015.8'
Conflicts:
  - doc/conf.py
2016-05-10 09:27:18 -06:00
Seth House
878d34a865 Doc mock decorators (#33132)
* Add mock function for mocking decorators

* Mock the stdlib user module because importing it will open the repl
2016-05-10 07:25:13 -07:00
rallytime
fa5e17b342 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/win_service.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
2016-03-30 15:33:13 -06:00
Jacob Hammons
50d1df2482 Fixes windows download paths to account for patch 2016-03-30 14:26:03 -06:00
rallytime
f6d9cdc633 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/ref/states/compiler_ordering.rst
  - doc/topics/installation/suse.rst
  - doc/topics/jobs/schedule.rst
  - doc/topics/targeting/grains.rst
  - doc/topics/tutorials/preseed_key.rst
  - doc/topics/tutorials/states_pt5.rst
  - pkg/suse/use-forking-daemon.patch
  - salt/minion.py
  - salt/modules/pacman.py
  - salt/modules/state.py
  - salt/modules/yumpkg.py
2016-03-25 11:47:16 -06:00
Jacob Hammons
544a1661ce 2015.5.10 release docs 2016-03-23 14:04:29 -06:00
Jacob Hammons
8ec5d989ad 2015.8.8 release docs 2016-03-23 14:00:30 -06:00
rallytime
fa09de7a58 Merge branch '2015.8' into '2016.3'
Conflicts:
  - tests/unit/states/rabbitmq_user_test.py
2016-03-23 10:56:25 -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
Jacob Hammons
fd7f7bcddf Updated release notes
Added a shortcut to link to pull requests
Added doc entries for all new modules
removed the unnecessary :undoc-members: option from recent doc module entries
2016-03-14 16:34:22 -06:00
rallytime
4baea26c58 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/topics/netapi/index.rst
  - salt/modules/win_servermanager.py
  - salt/modules/zypper.py
2016-02-20 12:27:41 -07:00
Jacob Hammons
07120a8d48 changed latest release to 2015.8.7 2016-02-18 17:29:44 -07:00
Jacob Hammons
d4fb33939e Release notes and versioning for 2015.8.7 2016-02-18 17:19:54 -07:00
Jacob Hammons
52d7b854d7 Support for building docs for next major release 2016-02-16 15:25:28 -07:00
Colton Myers
076b49a4ca Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3
Conflicts:
    README.rst
    doc/conf.py
    doc/ref/index.rst
    doc/ref/proxy/all/salt.proxy.ssh_sample.rst
    doc/topics/installation/rhel.rst
    doc/topics/releases/2015.8.4.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/opennebula.py
    salt/config/__init__.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_ec2.py
    salt/modules/boto_elasticache.py
    salt/modules/boto_elb.py
    salt/modules/boto_iam.py
    salt/modules/boto_rds.py
    salt/modules/boto_sns.py
    salt/modules/boto_sqs.py
    salt/modules/dracr.py
    salt/modules/git.py
    salt/modules/mine.py
    salt/modules/systemd.py
    salt/modules/win_pkg.py
    salt/modules/yumpkg.py
    salt/pillar/__init__.py
    salt/states/git.py
    salt/states/rabbitmq_vhost.py
    salt/states/saltmod.py
    salt/utils/pkg/rpm.py
    setup.py
    tests/unit/modules/systemd_test.py
    tests/unit/states/rabbitmq_vhost_test.py
2016-02-11 22:33:49 -07:00
Jacob Hammons
57c1ec637a Rev latest version to 2015.8.5 2016-02-04 18:20:04 -07:00
Jacob Hammons
93d47f8615 Versioned to 2015.8.5, added known issue #30300 to release notes 2016-02-04 18:10:59 -07:00
Jacob Hammons
c95bb60148 Version to 2015.8.4 2016-02-02 13:05:42 -07:00
Jacob Hammons
dfc1f7a57d Version to 2015.8.4, added CVE 2016-1866 to release notes 2016-02-02 13:02:19 -07:00
Mike Place
d9bf97fb16 Merge pull request #30793 from jacobhammons/release-2015.5
Versioned latest release to 2015.8.4
2016-02-01 14:52:43 -07:00
Jacob Hammons
c41e6bf981 Versioned latest release to 2015.8.4 2016-02-01 14:13:08 -07:00
rallytime
4fa80f2d5e Merge branch '2015.8' into 'develop'
Conflicts:
  - doc/ref/states/all/index.rst
  - salt/cloud/__init__.py
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/guestfs.py
  - salt/modules/ipmi.py
  - salt/modules/osquery.py
  - salt/modules/parted.py
  - salt/modules/seed.py
  - salt/modules/virt.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/boto_elb.py
  - salt/states/pkg.py
2016-01-26 16:19:39 -07:00
Erik Johnson
d649551fbf Merge branch '2015.5' into 2015.5-2015.8 2016-01-24 11:55:09 -06:00
Jacob Hammons
03c51bb54d Added placeholder release notes for 2015.5.10
Changed old doc links from docs.saltstack.org to docs.saltstack.com
2016-01-22 10:48:08 -07:00
Jacob Hammons
238ccba640 added tornado.netutil and tornado.stack_context to doc mock modules 2016-01-19 14:03:27 -07:00
Jacob Hammons
3c4989327b added tornado.iostream to doc mock modules 2016-01-19 10:06:36 -07:00
Colton Myers
19bc7b6ed4 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2016-01-15 09:24:10 -07:00
Colton Myers
5b53bf2597 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    salt/cloud/clouds/linode.py
    salt/states/rabbitmq_policy.py
2016-01-14 16:23:29 -07:00
Jacob Hammons
2431c4c5c3 Updated man page and doc conf.py copyright year to 2016 2016-01-08 11:08:59 -07:00
Jacob Hammons
fe3da1c174 Updated man pages and doc version for 2015.5.9 2016-01-08 11:05:46 -07:00
Jacob Hammons
ebf72924d2 updated version numbers in documentation 2015-12-03 09:21:48 -07:00
Jacob Hammons
486935b233 updated version numbers 2015-12-03 08:21:50 -07:00
Jacob Hammons
824721ff36 updated version numbers 2015-12-03 08:20:22 -07:00
Colton Myers
a471832fa7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/cloud/clouds/ec2.py
    salt/config/__init__.py
    salt/modules/git.py
    salt/modules/hosts.py
    salt/modules/htpasswd.py
    salt/states/boto_secgroup.py
    salt/states/htpasswd.py
    tests/unit/modules/schedule_test.py
2015-10-20 18:13:11 -06:00
Colton Myers
c4c889f97b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/conf.py
    salt/daemons/masterapi.py
    salt/minion.py
2015-10-20 14:47:49 -06:00
Jacob Hammons
bb61c68c11 Changed current release to 5.6 and added CVE to release notes 2015-10-15 11:19:11 -06:00
Jacob Hammons
236992b2be Changed current release to 8.1 and added CVEs to release notes 2015-10-15 11:14:50 -06:00
Colton Myers
41cad702e3 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/minion.py
    salt/modules/rest_service.py
    salt/states/dockerng.py
    salt/utils/cloud.py
2015-09-29 18:13:33 -06:00