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
81,324 Commits 24 Branches 182 Tags 341 MiB
741fd9d1ee
Commit Graph

81324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
b8b712ab3b Merge pull request #40925 from Michael-S/develop 
Add a note to the ssh_known_hosts State doc.
 2017-04-28 05:58:54 -06:00
Mike Place
5e79c9a3a4 Merge pull request #40926 from twangboy/py3_setup 
Use req files in pkg\windows for setup
 2017-04-28 05:57:25 -06:00
Mike Place
8cb5ce2eb3 Merge pull request #40939 from Ch3LL/fix_vmware_deploy 
Allow vmware to query deploy arg from opts
 2017-04-28 05:40:25 -06:00
Ch3LL
47cd491995
allow vmware to query deploy arg from opts 2017-04-27 16:31:42 -04:00
Nicole Thomas
abb42d1de3 Merge pull request #40932 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-27 11:47:05 -06:00
Nicole Thomas
f0a9767a96 Merge pull request #40931 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-04-27 11:46:29 -06:00
rallytime
7fb12e47d5 Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-04-27 10:37:43 -06:00
rallytime
a876bcdb8a Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-27 10:37:05 -06:00
twangboy
c03f8d39d2 Use req_2.txt for Py2 2017-04-27 09:51:32 -06:00
twangboy
57d5f781f4 Use req files in pkg\windows for setup 2017-04-27 09:47:46 -06:00
Mike Swierczek
373e12622a Add a note to the ssh_known_hosts State doc. 
I tried to use this state with multiple
hostname aliases in a single entry, and
discovered it did not work.  Hopefully this
documentation tweak will help future users.
 2017-04-27 11:25:18 -04:00
Mike Place
0f2ec1e1db Merge pull request #40894 from senthilkumar-e/broken_jobs_api_fix 
Fix for broken /jobs/<jid> in 2016.11.4
 2017-04-27 05:32:59 -06:00
Mike Place
cb7aa0856a Merge pull request #40910 from sjorge/mdata-relnotes 
update oxygen release notes for grains deprecation
 2017-04-27 05:08:27 -06:00
twangboy
1c3cd62594 Fix unicode support for win_system 2017-04-26 17:53:25 -06:00
Super-User
db6eadd6c3 update oxygen release notes for grains deprecation 2017-04-26 23:30:53 +02:00
Mike Place
d93841898f Merge pull request #40901 from ender8282/develop 
Add support for KDE neon
 2017-04-26 13:51:09 -06:00
Mike Place
34708956ed Merge pull request #40892 from StreetHawkInc/develop 
add minion function to reload beacon #35960
 2017-04-26 12:10:30 -06:00
John Hubbard
6a2c320b9b Added support for KDE neon 
Updated _OS_MAP_NAME and  _OS_FAMILY_MAP to map 'neon' into 'KDE neon' and to associate that with the Debian. 
For details about KDE neon see neon.kde.org
 2017-04-26 10:23:38 -07:00
Mike Place
7a63e3cfd2 Merge pull request #40668 from grep4linux/new_xen_cloud_driver 
new Xen cloud driver
 2017-04-26 10:59:38 -06:00
Nicole Thomas
000f8f7952 Merge pull request #40875 from Absolight/fix-pkgng-upgrade 
Remove some more raw string formatting forgotten in f4fb771.
 2017-04-26 10:08:17 -06:00
Nicole Thomas
c710ac8ebd Merge pull request #40842 from hujunya/bugfix/redis_clean_old_jobs 
fix redis returner clean_old_jobs
 2017-04-26 10:05:25 -06:00
Nicole Thomas
76d6419cfd Merge pull request #40868 from gtmanfred/develop 
Add Zookeeper tests
 2017-04-26 09:44:16 -06:00
Nicole Thomas
92003e2776 Merge pull request #40869 from gtmanfred/nitrogen 
Backport Fix for docker.push/pull
 2017-04-26 09:31:21 -06:00
Nicole Thomas
ea55c15367 Merge pull request #40876 from BenoitKnecht/fix-sqlite3-table-present-with-multiline-schema 
states: sqlite3: fix table_present with multi-line schema
 2017-04-26 09:21:18 -06:00
senthilkumar-e
2f55b26e08 Fixing the pylint issue 2017-04-26 20:51:14 +05:30
Pablo Suárez Hernández
2625229288 Pylint fixes 2017-04-26 14:42:54 +01:00
Pablo Suárez Hernández
9b241b7338 Adapting Zypper test to new list_downloaded output 2017-04-26 12:35:27 +01:00
Pablo Suarez Hernandez
49c2cc9ab6 Listing all patches instead of security ones only 2017-04-26 12:34:13 +01:00
Pablo Suarez Hernandez
ddf98e3fe3 Enhances pkg.list_downloaded information of a package 2017-04-26 12:34:13 +01:00
senthilkumar-e
fb607bab75 Fix for broken /jobs/<jid> in 2016.11.4 
Fixes #40845
 2017-04-26 11:22:12 +05:30
Steven Joseph
f65bb02d73 add minion function to reload beacon #35960 2017-04-26 15:17:00 +10:00
Daniel Wallace
2ad5025ecb add doc for make_digest_acl 2017-04-25 17:26:29 -06:00
Nicole Thomas
e09bafdceb Merge pull request #40742 from clinta/40741 
Fix #40741
 2017-04-25 16:52:05 -06:00
Nicole Thomas
d14def6454 Merge pull request #40874 from tonybaloney/libcloud_load_balancer_states 
Add Apache Libcloud Load Balancer State module
 2017-04-25 16:45:40 -06:00
Nicole Thomas
7c10a419a1 Merge pull request #40866 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-25 16:42:11 -06:00
rallytime
2f1998ac00 Pylint extra space 2017-04-25 16:41:39 -06:00
Daniel Wallace
eb24f5381a fix pylint 2017-04-25 15:26:12 -06:00
rallytime
ad9914353b Pylint fixes 2017-04-25 14:18:50 -06:00
Nicole Thomas
8305ff66ce Merge pull request #40885 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-04-25 14:12:32 -06:00
Daniel Wallace
f3825d3f5e skip tests if kazoo is not installed 2017-04-25 12:20:35 -06:00
Nicole Thomas
434e8082ba Quick lint fix for liblcoud_loadbalancer 
Added whitespace after `:`
 2017-04-25 11:32:02 -06:00
rallytime
d7831c451c Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-25 11:09:01 -06:00
rallytime
c3f4874c21 Pylint fixes and rework new test in dimensiondata cloud unit tests 2017-04-25 11:06:55 -06:00
rallytime
8e24b3a8b2 Pylint fixes for some cloud unit tests 2017-04-25 11:06:39 -06:00
rallytime
7f14a6491e Rename nova and openstack unit tests to test_*.py 2017-04-25 09:27:11 -06:00
Benoît Knecht
2ca627d02d states: sqlite3: fix table_present with multi-line schema 
With a sqlite3 database containing a table with this schema:

  CREATE TABLE `user` (
  `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL
  , `login` TEXT NOT NULL)

using `sqlite3.table_present` with this definition:

  user:
    sqlite3.table_present:
      - db: /tmp/sqlite.db
      - schema: |
          CREATE TABLE `user` (
          `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL
          , `login` TEXT NOT NULL)

returns an error indicating that the schemas do not match. That's
because the `schema` variable in the YAML ends with a newline, while the
schema returned by python-sqlite3 doesn't.

This commit strips leading and trailing whitespace from the YAML schema.
 2017-04-25 14:23:34 +02:00
Mathieu Arnold
f70ca0f91d Remove some more raw string formatting forgotten in f4fb771. 
Running pkg.upgrade without arguments worked, it was generating
`pkg upgrade --y` which is all right because the only possibility is
`--yes`.  But when running, for example, with dryrun=True, it ended up
generating `pkg upgrade --n` and `--n` and there are more than one
option that starts with `n`, `--no-install-scripts`, `--dry-run` and
`--no-repo-update`.
 2017-04-25 13:54:45 +02:00
Anthony Shaw
5dee8b12de
add support for custom algorithms and complementary test 2017-04-25 21:47:38 +10:00
Anthony Shaw
74b955004b
add docs for new state modules 2017-04-25 21:32:13 +10:00
Anthony Shaw
76bdcabe1e
add commands for adding and removing members from a balancer 2017-04-25 21:28:47 +10:00