Commit Graph

50225 Commits

Author SHA1 Message Date
Colton Myers
c920e88664 Put a bandaid on the save_load duplicate issue
Ref #22171
2015-03-31 11:11:28 -06:00
Mathieu Le Marec - Pasquet
e026b1bb19 Fix syntaxerror 2015-03-31 19:09:29 +02:00
Thomas S Hatch
d329943107 Merge pull request #22196 from rallytime/bp-cassandra-prs
Backport cassandra_cql module and returner to 2015.2
2015-03-31 11:02:54 -06:00
Nitin Madhok
bfa4ef77e2 Merge branch 'develop' of https://github.com/saltstack/salt into vmware-cloud-driver 2015-03-31 12:56:19 -04:00
Nitin Madhok
931ece7d20 Fixing some spninx errors and violations 2015-03-31 12:54:32 -04:00
Clint Armstrong
c1aabf5958 Merge branch 'develop' of https://github.com/saltstack/salt into x509 2015-03-31 12:48:39 -04:00
Clint Armstrong
24672e7a56 fix test errors 2015-03-31 12:48:24 -04:00
Mike Place
5005a6a81e Create an index for jids 2015-03-31 10:21:27 -06:00
rallytime
363702a99c Versionadded tags for new cassandra module and returner 2015-03-31 10:09:02 -06:00
rallytime
0cfc0bfa7c Change nocache default to False for returners in prep_jid func 2015-03-31 10:06:42 -06:00
Nitin Madhok
3fa499fd1d Adding Getting Started with VMware docs 2015-03-31 12:06:20 -04:00
rallytime
e3aec8d30c Backport salt/returners/cassandra_cql_return.py to 2015.2 2015-03-31 09:58:50 -06:00
rallytime
6774a3722b Backport salt/modules/cassandra_cql.py to 2015.2 2015-03-31 09:58:19 -06:00
Nicole Thomas
3cfc0a04f4 Merge pull request #22193 from saltstack/revert-22190-rh_service-unit-test
Revert "adding rh_service unit test"
2015-03-31 09:43:58 -06:00
Nicole Thomas
9412a83f2f Revert "adding rh_service unit test" 2015-03-31 09:42:47 -06:00
Clint Armstrong
a3afeb96c7 remove test state 2015-03-31 11:35:44 -04:00
Clint Armstrong
ec36c7b079 remove unneeded runner 2015-03-31 11:34:52 -04:00
Clint Armstrong
a3993f6773 remove testing state 2015-03-31 11:34:03 -04:00
Clint Armstrong
51b32b860b remove x509 runner docs 2015-03-31 11:31:49 -04:00
Clint Armstrong
2fd9cf70be Merge branch 'develop' into x509 2015-03-31 11:29:46 -04:00
Clint Armstrong
9de069ee30 lint 2015-03-31 11:23:55 -04:00
Nitin Madhok
3d501b7a66 Docs fixes and adding VMware to core config docs 2015-03-31 11:23:36 -04:00
Clint Armstrong
ac02f46e4b fix tests, and docs' 2015-03-31 11:22:14 -04:00
Nicole Thomas
44c7eb4d4b Merge pull request #22169 from basepi/merge-forward-develop
Merge forward from 2015.2 to develop
2015-03-31 09:21:36 -06:00
Clint Armstrong
2af6a65a75 return true on test 2015-03-31 10:55:28 -04:00
Colton Myers
6e10cb5e70 Merge pull request #10 from rallytime/merge-forward-develop
Add mock exception class to keystone unit test
2015-03-31 08:42:01 -06:00
Clint Armstrong
38d6400f2d docs 2015-03-31 10:28:06 -04:00
Clint Armstrong
719256147b docs 2015-03-31 10:08:45 -04:00
Clint Armstrong
14824aa18b docs 2015-03-31 10:03:24 -04:00
Clint Armstrong
d1d756249d docs 2015-03-31 09:48:35 -04:00
Clint Armstrong
d224041a22 docs 2015-03-31 09:43:27 -04:00
Clint Armstrong
8de9c78208 docs 2015-03-31 09:42:40 -04:00
Clint Armstrong
cf8653bf74 docs 2015-03-31 09:39:43 -04:00
Clint Armstrong
6d5e4441d1 doc fix 2015-03-31 09:29:20 -04:00
Clint Armstrong
3384c49ce3 lint 2015-03-31 09:27:47 -04:00
Claudiu Popescu
5562422135 Test parameters for delete_subnet 2015-03-31 15:04:20 +02:00
Clint Armstrong
a14804598d doc issues 2015-03-31 09:00:32 -04:00
Clint Armstrong
d55f9847b2 doc issues 2015-03-31 08:59:01 -04:00
Claudiu Popescu
573027569c Version and test fixes 2015-03-31 14:57:47 +02:00
Clint Armstrong
2b50510987 doc issues 2015-03-31 08:52:21 -04:00
Nicole Thomas
33727a5c32 Merge pull request #22190 from jayeshka/rh_service-unit-test
adding rh_service unit test
2015-03-31 06:48:36 -06:00
Nicole Thomas
7d47eded8b Merge pull request #22187 from jayeshka/sqlite3-unit-test
adding sqlite3_test unit test
2015-03-31 06:47:35 -06:00
Clint Armstrong
0d108f6701 doc issues 2015-03-31 08:46:08 -04:00
Nicole Thomas
a4e4b58882 Merge pull request #22189 from saltstack/revert-22143-state_unit_test
Revert "Adding state.py unit test"
2015-03-31 06:39:55 -06:00
Clint Armstrong
3840e7214f doc issues 2015-03-31 08:30:55 -04:00
Nicole Thomas
73aa39d3e2 Merge pull request #22183 from s0undt3ch/hotfix/pep8-disables
Disable PEP8 E402(E8402). Module level import not at top of file.
2015-03-31 06:14:01 -06:00
Clint Armstrong
018509a618 added docs 2015-03-31 08:13:24 -04:00
Jayesh Kariya
0190f4ac63 adding rh_service unit test 2015-03-31 17:42:14 +05:30
rallytime
88298c5599 Add mock exception class to keystone unit test
Fixes unit tests error for merge forward
2015-03-31 05:56:55 -06:00
Nicole Thomas
0ea0f3d592 Revert "Adding state.py unit test" 2015-03-31 05:32:29 -06:00