Commit Graph

3295 Commits

Author SHA1 Message Date
rallytime
73d73e80c1 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/topics/releases/2015.8.4.rst
  - doc/topics/releases/2015.8.5.rst
  - doc/topics/thorium/index.rst
  - salt/cloud/clouds/opennebula.py
  - salt/engines/thorium.py
  - salt/loader.py
  - salt/modules/archive.py
  - salt/modules/boto_vpc.py
  - salt/modules/data.py
  - salt/modules/reg.py
  - salt/pillar/mysql.py
  - salt/runners/cache.py
  - salt/states/archive.py
  - salt/states/cron.py
  - salt/states/file.py
  - salt/states/glance.py
  - salt/states/reg.py
  - salt/thorium/__init__.py
  - salt/thorium/check.py
  - salt/thorium/file.py
  - salt/thorium/reg.py
  - salt/utils/jid.py
  - salt/utils/parsers.py
  - setup.py
2016-02-12 14:38:50 -07:00
Colton Myers
52bc740399 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3
Conflicts:
    salt/cloud/clouds/libcloud_aws.py
    salt/cloud/clouds/opennebula.py
2016-02-11 22:38:12 -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
Justin Findlay
b58783b895 add 2015.8.7 release notes 2016-02-11 17:04:34 -07:00
twangboy
ee3d70a37d Add release notes
Also fixed some deprecation stuff that got lost in all the
rebasing and stuff
2016-02-11 15:09:56 -07:00
justinta89
f493423fbd Updated doc for clarity 2016-02-11 11:25:44 -07:00
justinta89
db7136235a Updated release doc with deprecations. 2016-02-11 11:25:44 -07:00
Mike Place
e76e472978 Include change on loadavg beacon in release notes 2016-02-11 09:42:45 -07:00
rallytime
742d0a6b04 Change all relevant Boron references to 2016.3.0
And more Boron deprecation warnings to Carbon
2016-02-10 15:45:28 -07:00
Marno van der Molen
76b6b5189c Fix documentation for cores_per_socket 2016-02-10 14:13:32 +01:00
Marno van der Molen
cf70f06ade add support for numCoresPerSocket parameter in vmware driver 2016-02-10 14:09:51 +01:00
Denys Havrysh
6370ddda9f Update RHEL installation guide 2016-02-10 09:57:17 +02:00
Denys Havrysh
afdaefbf3d Add systemctl examples for RHEL 7 to the installation guide 2016-02-09 14:48:26 +02:00
Denys Havrysh
069a661eb1 Correct ZeroMQ4 repo install guide for RHEL 2016-02-09 14:33:18 +02:00
Denys Havrysh
d2a9d67b5b Update installation instruction for community repos on RHEL 2016-02-09 13:57:58 +02:00
Andrew Pashkin
1f0c7496fc Specify usage of lookup key in formulas pillars 2016-02-09 13:41:35 +03:00
Denys Havrysh
bbdf2523c8 Add workaround for RHEL 7 systems mentioned in the issue #29094 2016-02-09 12:32:57 +02:00
Mike Place
5b0c7649c7 Merge pull request #30945 from cachedout/note_pillar_cli
Note that pillar cli args are sent via pub
2016-02-08 11:43:59 -07:00
rallytime
33eb6ba125 Remove overstate docs and a few references.
The overstate system was deprecated and removed in Beryllium, in
favor of orchestrate.
2016-02-08 09:28:32 -07:00
Mike Place
3ff7d49555 Note that pillar cli args are sent via pub 2016-02-05 10:54:16 -07:00
Jacob Hammons
fbb7605366 2015.8.5 release notes linking and clean up 2016-02-05 10:39:24 -07:00
Jacob Hammons
61ad242a89 Updated latest release to 2015.8.5, added a partial list of new modules and features to boron release notes 2016-02-04 18:16:01 -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
Mike Place
4372851ad9 Merge pull request #30895 from bdrung/2015.8
Fix various typos
2016-02-04 13:55:10 -07:00
Denys Havrysh
936c1ff6c8 Add explanation about N@ classifier. Inspired by #25292 2016-02-04 14:06:41 +02:00
Benjamin Drung
708f2ff8ea Fix typo reponse -> response 2016-02-04 13:06:04 +01:00
Benjamin Drung
72c4eab6d7 Fix typo propogate -> propagate 2016-02-04 13:04:27 +01:00
Benjamin Drung
4912e365cb Fix typo directores -> directories 2016-02-04 13:03:12 +01:00
Benjamin Drung
74c8aba03e Fix typo exeption -> exception 2016-02-04 13:01:41 +01:00
Benjamin Drung
4692d84b07 Fix typos of improvement 2016-02-04 13:00:25 +01:00
Benjamin Drung
213fc2d858 Fix typo occuring -> occurring 2016-02-04 12:59:07 +01:00
Benjamin Drung
fe6124003b Fix typo nonexistant -> nonexistent 2016-02-04 12:58:20 +01:00
Benjamin Drung
56ce7479b1 Fix typo catched -> caught 2016-02-04 12:57:20 +01:00
Benjamin Drung
821e690e65 Fix typo develoment -> development 2016-02-04 12:56:14 +01:00
Benjamin Drung
b51279e086 Fix typo overide -> override 2016-02-04 12:55:35 +01:00
Benjamin Drung
4f2f04ea7d Fix typo relevent -> relevant 2016-02-04 12:54:45 +01:00
Benjamin Drung
bf92c3663b Fix typo formating -> formatting 2016-02-04 12:45:19 +01:00
Benjamin Drung
cd72b12161 Fix typo thats -> that's 2016-02-04 12:39:41 +01:00
Benjamin Drung
6db9724ec7 Fix typo doesnt -> doesn't 2016-02-04 12:38:29 +01:00
Benjamin Drung
58d46a7e98 Fix typo certficate -> certificate 2016-02-04 12:34:50 +01:00
Thomas S Hatch
715d3e274f clarify that this is not final for this release 2016-02-03 21:20:25 -07:00
Thomas S Hatch
5e5ced1c66 add initial thorium docs 2016-02-03 18:34:17 -07:00
Mike Place
b6d952cff6 Merge pull request #30880 from jfindlay/VMware
VMWare -> VMware
2016-02-03 15:50:58 -07:00
Thomas S Hatch
03a890429f Merge pull request #30876 from cachedout/fixup_30830
Fixup 30830
2016-02-03 14:59:30 -07:00
Justin Findlay
b41850d9ed add release note about VMWare -> VMware 2016-02-03 14:54:11 -07:00
Justin Findlay
543f0ca712 doc, conf, pkg: VMWare -> VMware 2016-02-03 14:27:28 -07:00
Colton Myers
984ad7ea8b Add documentation for whitelist 2016-02-03 12:29:11 -07:00
Colton Myers
0c8e57852b Add minion_blackout documentation 2016-02-03 12:13:15 -07:00
Denys Havrysh
6648fd4c62 Correct links to Fedora COPR repositories 2016-02-03 14:38:50 +02:00
Denys Havrysh
083037fccc Remove duplicate post-installation tasks section 2016-02-03 14:29:25 +02:00