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
66,628 Commits 24 Branches 182 Tags 341 MiB
ca48a3e8df
Commit Graph

5624 Commits

Author SHA1 Message Date
Nicole Thomas
b32dd6d332 Merge pull request #31452 from anandxoriant/develop 
Updated win_organization_name default value for vmware driver
 2016-02-24 08:27:27 -07:00
Anand Nevase
a93c7e2ffa change win_organization_name default value to Organization 2016-02-24 17:34:07 +05:30
Mircea Ulinic
8ad5794b60 Proxy Minion for network devices using Napalm library 2016-02-23 17:44:39 +00:00
Mike Place
f833b6f5b6 Merge pull request #30891 from anandxoriant/develop 
Support for windows VM network (static/dhcp) configuration for vmware driver.
 2016-02-22 17:13:08 -07:00
Mike Place
08edcc0bb7 Merge pull request #31296 from kstreee/saltstack/salt#31194 
[saltstack/salt#31194] Fix issue of running multiple salt-api instances.
 2016-02-22 16:05:13 -07:00
Anand Nevase
12a0c76448 Updated Windows Fullname and Organization for vmware driver 2016-02-22 18:50:42 +05:30
kstreee
53e0b56b13 [saltstack/salt#31194] Add documentation about running multiple salt-api modules, advised by @whiteinge. 2016-02-22 11:35:16 +09:00
rallytime
38f89bf8fd Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
 2016-02-21 15:23:24 -07:00
Anand Nevase
b47799b17b Merge branch 'develop' of https://github.com/saltstack/salt into develop 2016-02-20 01:16:49 +05:30
Anand Nevase
a697c1845c Added windows vm changes as per review comments. 2016-02-20 01:12:47 +05:30
Jacob Hammons
017e7c18c4 changed build type back to develop after merge forward 2016-02-19 09:51:11 -07:00
Jacob Hammons
7cd824ced9 Change latest release to 2015.8.7 2016-02-18 17:24:27 -07:00
Mike Place
078cbd6f9c Merge pull request #31328 from edgan/develop 
Adding documentation for salt-ssh agent forwarding support
 2016-02-18 14:42:39 -07:00
Mike Place
b40c611d0d Merge pull request #31067 from jfindlay/deprecate_env 
Deprecate env
 2016-02-18 14:42:10 -07:00
Mike Place
02f79dc2b3 Merge pull request #31322 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-02-18 14:28:02 -07:00
Nathan Grennan
024439186a Adding documentation for salt-ssh agent forwarding support 2016-02-18 12:14:47 -08:00
rallytime
cc29092dcb Merge branch '2016.3' into 'develop' 2016-02-18 11:33:24 -07:00
rallytime
7ea9dacbdd Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
  - salt/minion.py
  - salt/modules/win_update.py
  - salt/modules/yumpkg.py
  - salt/utils/pkg/rpm.py
 2016-02-18 11:10:44 -07:00
Thomas S Hatch
2ef3918366 Add provisional statement to Thorium 2016-02-18 10:47:10 -07:00
Thomas S Hatch
56634682b2 sp 2016-02-18 09:32:23 -07:00
Thomas S Hatch
3ab8d21927 Add Thorium docs 2016-02-18 09:17:27 -07:00
Mike Place
7d8c2de090 Merge pull request #31281 from rallytime/bp-31218-and-31246 
Back-port #31218 and #31246 to 2016.3
 2016-02-17 13:27:41 -07:00
Mike Place
6fe4a7dc8a Document new functionality for packaging external modules 
Refs #31218
 2016-02-17 12:15:43 -07:00
Justin Findlay
896bfb181f carbon release notes: add note about env->saltenv deprecation 2016-02-16 21:37:30 -07:00
Justin Findlay
a260487298 carbon release notes: minor edits 2016-02-16 21:10:18 -07:00
Jacob Hammons
4640e819c8 Release notes updated 
Updates to doc build template
 2016-02-16 19:54:49 -07:00
Justin Findlay
4487d972f6 doc/topics/execution/remote_execution.rst: remove env support 2016-02-16 19:26:57 -07:00
Justin Findlay
bfc9982667 doc/topics/development/conventions/style.rst: remove env support 2016-02-16 19:26:57 -07:00
Justin Findlay
4953f7b0df doc/ref/renderers/index.rst: remove env support 2016-02-16 19:26:57 -07:00
Justin Findlay
a21bad82e5 doc/ref/file_server/index.rst: remove env support 2016-02-16 19:26:57 -07:00
Mike Place
11bcac2635 Merge pull request #31246 from cachedout/document_31218 
Document new functionality for packaging external modules
 2016-02-16 19:23:57 -07:00
Mike Place
39799fb31b Merge pull request #31244 from rallytime/release-notes-name 
Rename Boron release notes to 2016.3.0
 2016-02-16 19:23:06 -07:00
Jacob Hammons
3c4f8215c3 Fixes #30461 
Credited Sebastian Kramer for finding CVE 2016-1866 in release notes
Added note about salt virt not working on KVM in a VM
 2016-02-16 15:53:35 -07:00
Jacob Hammons
52d7b854d7 Support for building docs for next major release 2016-02-16 15:25:28 -07:00
Mike Place
93f84fe942 Document new functionality for packaging external modules 
Refs #31218
 2016-02-16 11:23:33 -07:00
rallytime
a19f7799e0 Rename Boron release notes to 2016.3.0 2016-02-16 11:16:09 -07:00
rallytime
8e3fd82718 Document onfail requisite bugfix behavior change 
Refs #22370 and #31235
 2016-02-16 10:44:42 -07:00
Mike Place
405d0aef1c Merge pull request #31184 from cachedout/document_consul_change 
Document change in consul pillars
 2016-02-16 09:11:52 -07:00
Mike Place
4cc033f8b9 Document change in consul pillars 
Refs #31165
 2016-02-12 15:13:53 -07:00
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
Mike Place
efe47eb7e1 Merge pull request #30917 from rallytime/remove-botocore-aws-driver 
Remove deprecated botocore_aws driver in Boron release
 2016-02-10 12:07:14 -07:00
Mike Place
313b82a0ab Merge pull request #30947 from rallytime/remove-libcloud-aws-driver 
Remove deprecated libcloud_aws driver in Boron release
 2016-02-10 12:01:57 -07:00