Brian Coca
49eb95e2d1
some fixes to become/sudo
...
* now it uses -n to get immediate error if no password is supplied and one is needed,
this should fix the issue with sudo hanging waiting for input.
* made -k configurable, this can break changing become_users in play if left out,
but opens up the possiblity of OTP support.
2015-08-15 12:17:40 -04:00
James Cammarata
4836641683
Use ansible_python_interpreter value for remote checksums
...
Fixes #11968
Fixes #11969
2015-08-15 12:00:55 -04:00
Brian Coca
7a51836530
check for failure in fact gathering
2015-08-15 11:29:10 -04:00
Brian Coca
1edae51e05
added generic service module, step #1 to separating services to their own modules
...
falls back to current service module and requries service mgr facts and new service modules
2015-08-15 11:00:26 -04:00
Brian Coca
172e0c328c
fixed adhoc fact gathering
2015-08-15 11:00:10 -04:00
Brian Coca
0381923333
fixed call to setup module
2015-08-15 10:50:22 -04:00
Brian Coca
92e2f54228
fixed issues with utf-8 encoding in docs, moved pager to use display class instad of bare prints
2015-08-14 22:00:48 -04:00
Brian Coca
245e0dd4b7
made returns from next task consistent to avoid typeerrors, also linear now checks for none
...
fixes #11965
2015-08-14 18:07:14 -04:00
Brian Coca
9f5e4c0ef6
lookup plugin that does no flattening
2015-08-14 17:05:41 -04:00
Abhijit Menon-Sen
8f231ec469
Tweak deprecation warning, and apply it to --limit also
2015-08-14 10:55:13 +05:30
James Cammarata
4714cbeec8
Override post validation of environment to allow bare variables
...
Also prints a deprecated warning if a bare variable is detected, so
that we can remove this in a future version.
Fixes #11912
2015-08-14 00:33:36 -04:00
James Cammarata
4dba30ccd0
Cleanup missed merge conflict sections
2015-08-13 15:05:58 -04:00
Abhijit Menon-Sen
d41db8edd6
Don't accept undocumented "p1;p2" patterns; note in changelog
...
The correct (and now only) way to say p1 OR p2 is "p1:p2".
2015-08-13 14:54:12 -04:00
Abhijit Menon-Sen
1437b8e120
Introduce _split_pattern to parse an "x:y:z" pattern
...
This function takes a string like 'foo:bar[1:2]:baz[x:y]-quux' and
returns a list of patterns ['foo', 'bar[1:2]', 'baz[x:y]-quux'], i.e.
splits the string on colons that are not part of a range specification.
2015-08-13 14:54:12 -04:00
James Cammarata
32034feec5
Add deprecation warning regarding host patterns
2015-08-13 14:51:08 -04:00
Abhijit Menon-Sen
6bf6b9fdbb
Rename some internal functions, clarify what they do
...
get_hosts → used externally, not changed
_get_hosts → _evaluate_patterns (takes a list, evaluates ! and &)
__get_hosts → _match_one_pattern (takes one pattern only, ignores !&)
2015-08-13 14:51:08 -04:00
Abhijit Menon-Sen
eff33bac49
Don't accept undocumented "p1;p2" patterns; note in changelog
...
The correct (and now only) way to say p1 OR p2 is "p1:p2".
2015-08-13 14:51:08 -04:00
Abhijit Menon-Sen
8aaa06dd50
Introduce _split_pattern to parse an "x:y:z" pattern
...
This function takes a string like 'foo:bar[1:2]:baz[x:y]-quux' and
returns a list of patterns ['foo', 'bar[1:2]', 'baz[x:y]-quux'], i.e.
splits the string on colons that are not part of a range specification.
2015-08-13 14:51:08 -04:00
Abhijit Menon-Sen
baf637b9ae
Remove dead code: Inventory.also_restrict_to/lift_also_restriction
...
This was used earlier to implement serial, but that's now done using
restrict_to_hosts() (whose docstring is also suitably adjusted here)
and there are no more callers.
2015-08-13 14:51:08 -04:00
James Cammarata
6c036c3633
Template parent include file paths
...
Fixes #11955
2015-08-13 13:01:45 -04:00
Brian Coca
b905f51341
fixed typo
2015-08-13 11:05:20 -04:00
Brian Coca
8af0ff4a58
Merge pull request #11567 from lekum/shelvefile_lookup
...
Add shelvefile lookup plugin
2015-08-13 10:47:44 -04:00
Brian Coca
fbc7224066
Merge pull request #11643 from bcoca/meta_inventory_and_fixes
...
Meta inventory and fixes
2015-08-13 10:36:57 -04:00
James Cammarata
eb381bd522
Add one more search path to path_dwim_relative
2015-08-13 09:53:09 -04:00
Brian Coca
c6733cc1a7
Merge pull request #9225 from qvicksilver/aix_unprivileged
...
AIX unprivileged facts collection
2015-08-12 23:48:44 -04:00
Brian Coca
5027f66562
Merge pull request #11864 from jhawkesworth/win_path_filters
...
add win_basename and win_dirname filters
2015-08-12 23:46:15 -04:00
James Cammarata
a498876bec
Make sure playbook includes use unique var dictionaries before modification
2015-08-12 23:38:47 -04:00
Brian Coca
5fec11f513
capture parsing exceptions and give nice error and location
2015-08-12 23:27:00 -04:00
Brian Coca
621b18c6ef
fixed source path discovery for unarchive in roles
...
fixes #11943
2015-08-12 22:50:30 -04:00
Brian Coca
70d024ffce
show errors when missing vars file or when there is syntax issue in the file
...
fixes #11945
2015-08-12 22:39:06 -04:00
Brian Coca
3d9875773b
Merge pull request #11947 from resmo/for-ansible
...
cloudstack: refactor get_result()
2015-08-12 17:46:18 -04:00
Brian Coca
2c34a5bdbd
pass list correctly to lookup
2015-08-12 17:42:06 -04:00
James Cammarata
dd67b1e4d6
Adjust relative include searches when roles are involved
...
Fixes #11895
2015-08-12 17:15:52 -04:00
Rene Moser
4f3c863b42
cloudstack: refactor get_result()
...
* A commen dict of keys has been defined, which we look in results returned from the API.
* self.returns dict can be use in subclass to extend this dict.
* Optionally the key name can be replaced with a new key name, often used to make the return keys identical to the arguments passed.
* Use new style class
2015-08-12 23:14:17 +02:00
James Cammarata
d9833f227f
Make sure cached data from file loads isn't impacted by modifications
...
Fixes #11893
2015-08-12 14:30:43 -04:00
Brian Coca
6bceee9a93
now lvs/vg facts are only attempted if binary found
2015-08-12 10:53:13 -04:00
James Cammarata
c7dde72aa0
Default listify to converting bare variables again
...
Since we explicitly set convert_bare=False in the template lookup
code, but still want individual looks that call listify directly to
convert bare variables if needed.
2015-08-12 10:49:46 -04:00
James Cammarata
ac66e4001c
Fix for variable precedence with tasks/includes
...
Fixes #11881
2015-08-12 10:49:45 -04:00
Brian Coca
2688edb32b
Merge pull request #11940 from alxgu/fix_lvm_facts
...
bugfix: missing path for lvm facts
2015-08-12 10:49:14 -04:00
Brian Coca
39f81a8fa5
removed unused imports
2015-08-12 10:35:49 -04:00
Brian Coca
c27978fa93
minor fixes to pull
2015-08-12 10:35:49 -04:00
Brian Coca
9f29e39dea
give more matching options for ansible-pull
2015-08-12 10:35:49 -04:00
Brian Coca
e46b1e8d2b
adjusted tree to work more like v1, also now skips when dir not supplied
2015-08-12 10:35:49 -04:00
Alexander Gubin
1ea1b9fb13
bugfix: missing path for lvm facts
2015-08-12 16:35:31 +02:00
Brian Coca
49d88cef9c
meta: refresh_inventory and several inventory fixes
2015-08-12 10:35:12 -04:00
Brian Coca
8e30e3791e
Merge pull request #11811 from amenonsen/fixme-range
...
FIXME in host range parsing
2015-08-12 09:06:39 -04:00
Brian Coca
ae9d264b86
Merge pull request #11762 from amenonsen/9795-rebase
...
Add LVM facts to setup module
2015-08-12 08:55:08 -04:00
James Cammarata
829a88b906
Disable undefined error failures during conditional templating
...
This allows us to properly catch the 'is defined' and 'is undefined'
checks and return the correct boolean result.
Fixes #11892
2015-08-12 07:37:03 -04:00
James Cammarata
e0b074000e
Merge pull request #11764 from lpirl/devel_v2
...
fixes remote code execution for su/sudo with strict remote umasks
2015-08-11 22:30:44 -04:00
James Cammarata
38eb53de1d
Fix bug in vars using correct temp value for vars
...
Fixes #11877
2015-08-11 21:23:37 -04:00
Brian Coca
4d853a5d3c
implemented for v2, missing --tree option for adhoc
2015-08-11 19:18:10 -04:00
Brian Coca
79a1bca010
avoid circular import
2015-08-11 17:20:48 -04:00
Brian Coca
a83b8220ef
added import back
2015-08-11 16:42:51 -04:00
Brian Coca
6e825e8c22
fixed listify for lookups, made sure convert_bare is only on with_
2015-08-11 16:42:09 -04:00
James Cammarata
adb9d7e461
Track role execution per-host, not overall in the role
...
Fixes #11863
Fixes #11878
2015-08-11 16:34:58 -04:00
Rene Moser
e62fbf5fba
cloudstack: add get_result() in utils to return common results
2015-08-11 18:03:50 +02:00
James Cammarata
f904acbd14
Fixing bug related to listify changes
2015-08-11 01:33:43 -04:00
James Cammarata
169d316704
Fixing bugs in include + loops
...
Fixes #11872
2015-08-11 01:33:43 -04:00
Brian Coca
7666bde666
updated hashi_vault to new listify, added to changelog
2015-08-10 21:10:00 -04:00
Brian Coca
4399ddc7da
Merge pull request #11674 from defionscode/hashi_vault_lookup
...
Hashicorp Vault lookup Plugin
2015-08-10 21:07:22 -04:00
Jonathan Davila
175068fdae
Hashicorp Vault lookup Plugin
2015-08-10 19:35:28 -04:00
Brian Coca
7e7b546c34
reinstated listify
2015-08-10 17:38:20 -04:00
Brian Coca
3e5dbd045f
fixed ref to removed var
2015-08-10 14:02:42 -04:00
Brian Coca
5c1d850fbb
now fixed to actually work
2015-08-10 13:51:56 -04:00
Brian Coca
ee365c881f
fixed typo
2015-08-10 13:44:52 -04:00
Brian Coca
c08305a31f
set script command itself to be sudable and not use the chmod sudoable settings as it can
...
ignore sudo settings for script when become_user is not root
fixes #11902
2015-08-10 13:19:37 -04:00
Toshio Kuratomi
d35b956900
listify lookup plugin terms when they're specified as "{{ lookup(terms) }}"
...
Before this, they were not listified there but they were listified when
specified like this:
with_lookup: terms
2015-08-10 09:07:37 -07:00
Brian Coca
dbab703265
fine tuned password handling as we were getting false positives, probably caused by other changes up the stack that now call these functions in more cases.
2015-08-07 16:27:25 -04:00
Brian Coca
6fcfebd21d
made sure we need becoem before we format the command, added debug entry also
2015-08-07 16:27:25 -04:00
Brian Coca
df768e0db4
fixed debug statement
2015-08-07 16:27:25 -04:00
Brian Coca
177499476b
fixed warning
2015-08-07 16:27:25 -04:00
Toshio Kuratomi
3ef49844db
Update core submodule ref
2015-08-07 12:28:56 -07:00
Brian Coca
8f106c9a58
Merge pull request #11078 from Yannig/devel
...
New lookup plugin : ini
2015-08-07 09:46:54 -04:00
Yannig Perré
07fcb50b9b
Porting ini lookup plugin against ansible v2.
2015-08-07 09:40:24 +02:00
Toshio Kuratomi
f1144752c4
Pull in docs fix from core modules
2015-08-06 21:11:49 -07:00
James Cammarata
e7d0c9f820
Re-add vars to Base and standardize var processing
...
Fixes #11779
2015-08-07 00:06:30 -04:00
Brian Coca
dbe7a9fe2f
Merge pull request #11857 from quinot/bug/playbook-init-comment
...
Minor comment fix
2015-08-06 23:39:08 -04:00
Brian Coca
3c57018a10
Merge pull request #11778 from Ensighten/add_credstash_plugin
...
add credstash lookup plugin
2015-08-06 23:27:18 -04:00
Brian Coca
d47d0b1d7f
now continue/abort mode allows ignoring other input
2015-08-06 22:16:30 -04:00
Brian Coca
a555a0652e
allow for vars_prompt and pause prompt to be skipped in non interactive settings
...
ansible-pull users rejoice
2015-08-06 19:20:45 -04:00
Toshio Kuratomi
ce52fdebe8
Pull in get_url checksum change
2015-08-06 15:45:23 -07:00
Brian Coca
29cd72b7d8
even simpler condition tree for pause
2015-08-06 18:40:15 -04:00
Brian Coca
dc80bc8929
now pause behaves like v1 pause
2015-08-06 18:09:59 -04:00
Brian Coca
f7707d8850
brought user_input back to pause
2015-08-06 17:49:14 -04:00
Toshio Kuratomi
00b1a2c865
Restore ValueError in md5 method and change finding the available hash algorithms so we only have to do it once
2015-08-06 14:40:28 -07:00
Brian Coca
15a20e814b
added tags back to ansible-pull
2015-08-06 17:37:05 -04:00
Brian Coca
5f0359c119
keep banners at 79
2015-08-06 17:37:05 -04:00
Brian Coca
25e67bb716
text wrap now adapts to terminal
2015-08-06 17:37:05 -04:00
Toshio Kuratomi
80cb69214b
Merge pull request #11840 from muffl0n/module_utils_hash_algorithms
...
Add get_available_hash_algorithms()
2015-08-06 14:29:31 -07:00
James Cammarata
d44daf53cc
Allow wrapped text in deprecated messages
2015-08-06 17:21:02 -04:00
James Cammarata
5eb092b331
Handle top-level vars for include tasks to match v1 syntax
...
The "streamlined" syntax will be deprecated at some point in the future.
Fixes #11882
2015-08-06 17:21:02 -04:00
Toshio Kuratomi
e16b24c01e
Update submodule ref
2015-08-06 08:45:09 -07:00
Toshio Kuratomi
e8452c864e
Restore the relative path handling portion of #11865
2015-08-06 07:28:22 -07:00
James Cammarata
26d5a17b59
Make sure inventory loads files with non-relative paths
...
This is a slightly different fix than we originally committed, but fixes
the problem in a less invasive way (and I believe it's generally better
that we don't deal with relative paths internally past this point)
Fixes #11789
2015-08-06 10:18:58 -04:00
Brian Coca
b9433650d1
Revert "Path of group_vars and host_vars were getting the basedir added twice."
...
in view of simpler solution incomming from james
This reverts commit bae7a02be5
.
2015-08-06 10:09:43 -04:00
Brian Coca
9f156e5550
updated submodule refs
2015-08-06 09:42:35 -04:00
Brian Coca
7bea04141b
Merge pull request #11865 from ansible/fix-group_vars_path
...
Path of group_vars and host_vars were getting the basedir added twice.
2015-08-06 09:40:13 -04:00
Brian Coca
08e6c1d82b
avoid possible errors with new broadcast handling in linux
2015-08-06 09:00:52 -04:00
Brian Coca
cb2cfaebda
started porting chroot to v2
2015-08-06 08:55:22 -04:00
Brian Coca
262c75c253
Merge pull request #10971 from mightydok/debbraoadcastfix
...
Add missed broadcast address to linux network facts.
2015-08-06 08:52:55 -04:00
Scott Cunningham
87ef53c962
credstash lookup plugin: python 2.6-compatible string.format()
2015-08-05 23:40:43 -07:00
Scott Cunningham
c4629b72e0
credstash lookup plugin: error out in run function when credstash not installed, not at module scope
2015-08-05 23:37:10 -07:00
Toshio Kuratomi
bae7a02be5
Path of group_vars and host_vars were getting the basedir added twice.
...
Fix inventory so this won't happen and fix DataLoader so that it will
test relative paths relative to self._basedir
Fixes #11789
2015-08-05 17:41:17 -07:00
Toshio Kuratomi
e7b5cb8782
Fix synchronize source path with roles and local connection
...
Fixes #8261
2015-08-05 13:32:12 -07:00
Toshio Kuratomi
dd7fa07038
Update submodule refs so synchronize plugin works
2015-08-05 13:19:28 -07:00
Toshio Kuratomi
308bf80055
Cleanups to synchronize including:
...
* Better comments
* Reorganize code so related settings are close to each other
* Add ::1 to the "localhost" patterns we look for
* Make the dest_port parameter override the ansible_ssh_port setting
* Fix dest_port (wasn't being set)
* more complete detection of delegate_to
* Fix set_remote_user (wasn't being looked for in parameters)
* Instead of removing mode here, have the ansible module accept it
(better documents the parameters doing it htat way)
2015-08-05 13:16:08 -07:00
James Cammarata
37e38924de
Allow field attributes to have priorities
...
So that roles are loaded ahead of all other play fields, meaning any
plugins contained within the roles are loaded first before tasks.
Fixes #11858
2015-08-05 13:54:00 -04:00
Jon Hawkesworth
f69da544f7
add win_basename and win_dirname filters
2015-08-05 18:38:15 +01:00
James Cammarata
fad44862a5
Implementing includes in the free strategy
2015-08-05 11:53:04 -04:00
Brian Coca
2b9b3a08a1
make sure you only update pci data if there is a match
2015-08-05 09:44:37 -04:00
Yannig Perré
09d257e637
Porting ini lookup plugin against ansible v2.
2015-08-05 12:07:16 +02:00
Thomas Quinot
5d3cb636ad
Minor comment fix
2015-08-05 11:30:26 +02:00
Yannig Perré
47db352725
Merge remote-tracking branch 'ansible/devel' into devel
2015-08-05 11:20:41 +02:00
Yannig Perré
733d40a77c
When value does not exist, return default value instead of stopping ansible with an exception.
2015-08-05 10:54:24 +02:00
James Cammarata
faf4c3bb6c
Merge pull request #11816 from amenonsen/ssh-ipv6
...
Fix ssh connections to IPv6 addresses
2015-08-05 00:10:34 -04:00
James Cammarata
dbd755e0f4
Fix jinja2 template search pathing
...
Fixes #9933
2015-08-04 22:50:16 -04:00
Scott Cunningham
934ce86d35
update credstash lookup plugin to use Python 2.4-compatible exception catching
2015-08-04 18:29:37 -07:00
James Cammarata
61e76fd707
Allow conditionals on PlaybookInclude statements
...
Fixes #11852
2015-08-04 15:24:28 -04:00
James Cammarata
b6c3e5d797
Validate variable names given in set_fact
...
Fixes #11851
2015-08-04 13:30:47 -04:00
James Cammarata
5266679964
Use templar all the way down
...
Fixes bugs related to creating Templar() objects on the fly, where
the shared loader objects (serialized to TaskExecutor) aren't used
so information loaded into plugin loaders after forking is lost.
Fixes #11815
2015-08-04 12:25:53 -04:00
muffl0n
8d6d711a5c
move get_available_hash_algorithms() from get_url
2015-08-04 08:57:36 +02:00
James Cammarata
c3ce140dd2
Exclude loop_args from post_validation for tasks
...
This field is templated specially during the TaskExecutor's loop
calculation, so there's no need to post validate it again.
Fixes #11481
2015-08-04 01:12:27 -04:00
Brian Coca
015b922c1f
fix quoting for become commands
...
fixes #11808
2015-08-03 18:49:23 -04:00
Toshio Kuratomi
ca941ec632
style cleanup because -ECANNOTUNDERSTAND without it
2015-08-03 15:05:26 -07:00
Toshio Kuratomi
f86245dcb0
Add a warning about python3 in the synchronize plugin
2015-08-03 15:05:26 -07:00
Toshio Kuratomi
f0431eaea9
Make ansible_python_interpreter work with synchronize
...
Fixes #11836
2015-08-03 13:32:24 -07:00
James Cammarata
8279557e8f
Allow role names to be templated
...
Fixes #10858
2015-08-03 16:26:13 -04:00
James Cammarata
ed603f7030
Fix free strategy only running first play in a multi-play playbook
...
Fixes #11839
2015-08-03 14:40:16 -04:00
James Cammarata
c2435fab7e
Inject the play context vars into the variables used for loop item templating
2015-08-03 12:12:45 -04:00
James Cammarata
bcbcfc79be
Fix relative paths for included files
...
Also modifies the Play class to not include become* fields in the
post-validation step.
Fixes #11353
2015-08-03 12:04:31 -04:00
James Cammarata
2673eb0afb
Add option to fail on undefined variables to listify
...
And use it in the call to get the loop items for a task.
2015-08-03 12:04:31 -04:00
James Cammarata
a586c74967
Merge pull request #11838 from cchurch/stringify_powershell_unquote_value
...
Fix for PowerShell unquote method when passed None.
2015-08-02 22:57:27 -04:00
James Cammarata
f6d1b5e233
Merge pull request #11835 from cchurch/raw_is_not_raw_enough
...
Raw is not raw enough
2015-08-02 22:56:45 -04:00
James Cammarata
7b9aee7077
Merge pull request #11832 from amenonsen/zeroforks
...
Disallow --forks 0
2015-08-02 22:39:21 -04:00
Chris Church
cafc35fd5b
Fix for PowerShell unquote method when passed None.
2015-08-02 18:38:29 -04:00
Abhijit Menon-Sen
7d9689c1c5
Slice ascii_letters directly instead of using 'for x in range()'
2015-08-02 23:47:18 +05:30
Abhijit Menon-Sen
bfe708a189
Make host range parsing errors issue better messages
...
Now we always say "host range must …specific thing…"
2015-08-02 23:47:18 +05:30
Abhijit Menon-Sen
1413496292
Implement step for alphabetic ranges: [a:e:2] => a,c,e
2015-08-02 23:47:18 +05:30
Abhijit Menon-Sen
72715c6add
Fix ssh connections to IPv6 addresses
...
We can unconditionally wrap remote_addr in square brackets for scp and
sftp (both of which require them for IPv6 addresses), but not wrap them
at all for ssh (which doesn't accept them). This way, we don't have to
detect and treat IPv6 addresses specially. This works for hostnames,
IPv4 addresses, and IPv6 addresses.
The earlier code seemed to intend to wrap all IPv6 addresses in square
brackets, which would have broken ssh, but it actually made no attempt
to detect IPv6 addresses at all (so it broke only with IPv6 addresses
for scp and sftp).
Based on a review of PR #11677 by @JuiceBoxSingularity
2015-08-02 23:46:01 +05:30
Chris Church
6969b5ac8b
Make sure raw doesn't eat key=value arguments.
2015-08-02 11:57:32 -04:00
Abhijit Menon-Sen
861da614cc
Make 'pause: prompt=…' print the prompt
...
In stable-1.9, the prompt string is passed to raw_input(), which prints
it without an extra \n. Here we're just print()ing it, so the \n would
be doubled.
2015-08-02 20:08:28 +05:30
James Cammarata
9936c5f9f6
Fixing the pause module for devel
2015-08-02 09:29:13 -04:00
Abhijit Menon-Sen
8de70fa657
Disallow --forks 0
...
Without at least one worker process, things break:
Traceback (most recent call last):
File "/home/ams/extern/ansible/ansible/lib/ansible/executor/process/result.py", line 103, in run
result = self._read_worker_result()
File "/home/ams/extern/ansible/ansible/lib/ansible/executor/process/result.py", line 69, in _read_worker_result
(worker_prc, main_q, rslt_q) = self._workers[self._cur_worker]
IndexError: list index out of range
2015-08-02 14:10:45 +05:30
Toshio Kuratomi
cf35bdbdf9
Merge pull request #11827 from amenonsen/trivial-fixmes
...
Remove TODO: the play already overrides options
2015-08-01 07:40:15 -07:00
Abhijit Menon-Sen
a9b020d6de
Remove TODO: the play already overrides options
2015-08-01 20:09:02 +05:30
Abhijit Menon-Sen
1f2adb5e14
Show a better message when ansible.cfg is not found
...
Earlier we would say «Using as config file» if we didn't find one.
2015-08-01 19:44:20 +05:30
Abhijit Menon-Sen
2cb7cd8379
Remove outdated FIXME; _compute_delegate is called below
2015-08-01 09:35:32 +05:30
Abhijit Menon-Sen
7b3cb2126c
Remove outdated FIXME; ROLE_CACHE is already implemented below
2015-08-01 09:34:32 +05:30
Toshio Kuratomi
91a77b8603
Fix potential bug in parameter passing
2015-07-31 20:35:01 -07:00
James Cammarata
13b8a57d3d
Undo previous travis/tox fixes and fix underlying issue
2015-07-31 23:01:43 -04:00