Ronald van Zantvoort
bfbca748e2
highstate output: Document additional output modes
2017-09-25 18:32:52 +02:00
rallytime
cc07664a9f
Replace Nitrogen with 2017.7.0 in remain directories
2017-06-14 12:18:37 -06:00
Mircea Ulinic
18d84dc083
tpyo
2017-03-24 01:55:48 +00:00
Mircea Ulinic
2cfda17165
Add Nitrogen proxy opts to conf
2017-03-24 01:55:48 +00:00
Felix Dreissig
78a185ab11
Fix comments about file backup directory
...
The actual file state backup directory is called "file_backup" without a
trailing 's'.
2017-02-26 22:49:29 +01:00
rallytime
62e3c44045
Switch proxy_merge_grains_in_module option default from False to True
2016-11-29 10:51:46 -07:00
rallytime
6332da5c44
Prep release notes for 2016.11
2016-10-31 13:05:24 -06:00
rallytime
de4b33f2e1
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/client/ssh/__init__.py
- salt/client/ssh/shell.py
- salt/config/__init__.py
- salt/grains/core.py
- salt/utils/gitfs.py
2016-08-08 12:34:23 -06:00
C. R. Oldham
84cc7d67c0
Add documentation for append_minionid_config_dirs.
2016-08-03 12:36:37 -06:00
EYJ
beea8cc376
Fix millisecond formatting to avoid 1000 as four-digit milliseconds
2016-06-02 17:43:27 +02:00
rallytime
eb6773823b
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/modules/rh_service.py
2016-04-01 10:33:44 -06:00
C. R. Oldham
7abf8becaa
Documentation updates that go with PR #32252 .
2016-03-31 10:41:24 -06:00
rallytime
308aa5fd61
Merge branch '2016.3' into 'develop'
...
Conflicts:
- conf/master
- conf/minion
- doc/ref/proxy/all/index.rst
- salt/cli/daemons.py
- salt/modules/key.py
- salt/modules/reg.py
- salt/modules/win_pkg.py
- salt/utils/__init__.py
- salt/utils/cloud.py
- tests/unit/daemons_test.py
2016-03-18 10:57:15 -06:00
rallytime
838dc12b77
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- salt/cli/daemons.py
- salt/config/__init__.py
- salt/exceptions.py
- salt/pillar/foreman.py
- salt/returners/local_cache.py
- salt/states/saltmod.py
- salt/utils/__init__.py
- salt/utils/cloud.py
The merge conflicts in salt/cli/daemons.py are still present in this commit.
@s0undt3ch is going to resolve them after this commit.
2016-03-08 10:14:32 -07:00
Bo Maryniuk
373493c13f
Remove SHA1 for SHA256
2016-03-03 21:44:14 +01:00
Bo Maryniuk
95cb59dec7
Set defalt hash as SHA1 in config and explain why.
2016-03-03 21:41:08 +01:00
Bo Maryniuk
f276441ae8
Suggest hash SHA256 in the configs as a defaut and explain why.
2016-03-03 10:17:10 +01: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
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
Benjamin Drung
bf92c3663b
Fix typo formating -> formatting
2016-02-04 12:45:19 +01:00
C. R. Oldham
1e031c4940
Default configuration file for proxy minions.
2015-11-03 12:31:58 -07:00
