Commit a7fece2
Nathan Beittenmiller
Merge branch 'update_product_names' of github.com:beittenc/softlayer-python into update_product_names
Conflicts:
SoftLayer/CLI/core.py
SoftLayer/CLI/environment.py
SoftLayer/managers/__init__.py
SoftLayer/tests/CLI/core_tests.py4 files changed
Lines changed: 2 additions & 815 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
13 | 12 | | |
14 | 13 | | |
15 | | - | |
| 14 | + | |
16 | 15 | | |
17 | 16 | | |
18 | 17 | | |
| |||
0 commit comments