valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
67,953 Commits 24 Branches 182 Tags 341 MiB
0bde9f0aef
Commit Graph

33 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
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
justinta89
cfc7075c44 Lint and test fixes 2016-02-11 11:22:35 -07:00
justinta89
053ae0cae6 Updated tests to work with code deprecations 2016-02-11 11:22:35 -07:00
Colton Myers
67e17b3022 Revert "Deprecated code removed. " 2016-02-10 11:40:48 -07:00
justinta89
9b1e4b7ad7 Removed test for deprecated mysql_query 2016-02-04 15:33:08 -07:00
justinta89
a678b045e8 mysql pillar deprecated code removed 2016-02-04 15:26:28 -07:00
Benjamin Drung
56ce7479b1 Fix typo catched -> caught 2016-02-04 12:57:20 +01:00
Andrew Colin Kissa
b749b9faba Add Pillar SQLCipher module 
Fixes #29781
 2015-12-17 09:48:27 +02:00
Erik Johnson
a1ffa0c1c4 More test fixes 2015-07-22 10:40:49 -05:00
Erik Johnson
73192390a2 Test fixes 2015-07-22 00:48:43 -05:00
Brett Mack
6ca1dbd65c Don't split multiline values into a list if wrapped inside " 
Use salt.utils.dictupdate to merge dictionaries
 2015-06-12 03:46:28 +01:00
Brett Mack
1bbaf0e9a0 More style guideline fixes 2015-06-12 03:46:28 +01:00
Brett Mack
2ce52ee95f Style changes to bring code in line with coding standards 2015-06-12 03:46:28 +01:00
Brett Mack
fed5ce8e4b Use consul as an external pillar source. Requires python-consul 2015-06-12 03:46:28 +01:00
Aneesh Agrawal
ac4792f68d Add a SQLite3 ext_pillar built on the sql_base pillar. 2015-05-27 14:45:33 -04:00
Aneesh Agrawal
decb6cef97 Extract PEP 249 compliant sql_base ext_pillar from MySQL. 
Refactor the mysql ext_pillar so all PEP 249 generic code is in
sql_base to allow for easy addition of new ext_pillars.
 2015-05-27 14:45:33 -04:00
Mike Place
bb49244c37 Fix test 2015-04-22 16:28:09 -06:00
jfindlay
8e4bf33404 Merge pull request #21930 from ptonelli/develop 
add hg_pillar similar to git_pillar
 2015-03-24 13:10:53 -06:00
Paul Tonelli
15f66d1f0f fix hg_pillar unittest lint errors 2015-03-24 15:52:13 +01:00
Georges Racinet
458cc64886 Pylint error + standalone launcher 2015-03-16 18:13:52 +01:00
Georges Racinet
2901c98119 git_test: credits 2015-03-15 19:07:34 +01:00
Georges Racinet
0dae9dfa5d Tests for git_pillar 
Two different calls of the `ext_pillar` entry function are checked, a
direct one and one from upper in the calling stack (more integration)
The different options show the slight differences (almost side effects
between them).

A third test is included to detect infinite recursions, to avoid future
refactors that could bring them back accidentally.
 2015-03-15 18:50:57 +01:00
Paul Tonelli
ca4061b5b8 add hg_pillar and corresponding unit test 2015-03-04 19:00:23 +01:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
Mike Place
9303e48f4b Change mysql pillar test to use updated class name 2014-12-24 11:19:22 -07:00
rallytime
b579247646 Add no_mock/_reason and ensure_in_syspath 2014-08-12 16:48:01 -06:00
rallytime
a0233b3ebf Fix pillar mysql test formatting 2014-08-12 16:44:33 -06:00
Pedro Algarvio
ea8db1e427 Allow standalone test execution 2014-03-31 03:05:05 +01:00
Thomas S Hatch
67205e2106 whitespace 2014-02-14 16:34:03 -07:00
rallytime
647122cc55 lint fixes 2014-02-14 13:44:36 -07:00
Daniel Bradshaw
95e32ec52b Support for coercing dicts to lists. 
Specify fields to be hit with dict.values()
 2014-02-06 05:14:52 +00:00
Kaithar
41714c3adb Test cases 2014-02-06 05:14:52 +00:00