Commit Graph

8 Commits

Author SHA1 Message Date
Mike Place
1357244ef9 Schema test requires jsonschema 2.5.0 or above 2016-09-14 19:03:13 +09:00
Daniel Wallace
445c7a2c20 [PY3] python3ize schema test
thirsty is specified as a boolean

need to copy the top level of kwargs so that the dictionary does not
changes size during the loop.
2016-08-02 10:25:35 -05:00
Alexandru Bleotu
d69ce3a84f JSON Schema Extension
- added support for JSON schemas that validate complex JSON objects
  (JSON objects that have as attributes other JSON objects)
2016-06-03 14:03:26 +01:00
rallytime
6360ecd3b3 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cloud/clouds/scaleway.py
  - salt/config/__init__.py
  - salt/log/mixins.py
  - salt/minion.py
  - salt/modules/ps.py
  - salt/utils/decorators/__init__.py
  - salt/utils/schema.py
  - tests/unit/modules/etcd_mod_test.py
  - tests/unit/modules/file_test.py
2016-03-18 11:26:12 -06:00
Colton Myers
f3c8ba85dc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/cloud/clouds/opennebula.py
    salt/modules/systemd.py
    salt/utils/aws.py
2015-08-17 17:06:59 -06:00
Pedro Algarvio
05165467e8 Allow schemas to override it's class attribute name 2015-07-31 22:42:43 +01:00
Pedro Algarvio
55918b7d50 Allow schema items to override it's class attribute name 2015-07-31 21:00:22 +01:00
Pedro Algarvio
10c47647e3 Also rename the test module 2015-07-28 10:33:08 +01:00