Test to delete assigned block
Deuce Context - OpenStack Swift

JIRA: CBDEUCE-149
- Initial conversion of Auth Token from request.auth_token to Deuce Context
Deuce Context - OpenStack Swift

JIRA: CBDEUCE-149
- Complete the conversion of storing the Auth Token in the Deuce Context
Merge branch 'master' into enhancement_deuce_context_swift

Conflicts:
	deuce/controllers/vault.py
Merge branch 'enhancement_deuce_context_swift' into enhancement_deuce_context_swift_full

Conflicts:
	deuce/controllers/vault.py
Deuce Context - Unify

- Move the initialization of the Deuce Context to the FunctionalTest.setUp() so that it can be done once
-- Each test that needs to change something about the context will still have to import deuce and modify context, like the invalid token test for Swift does
Deuce Context - Unify

- Missed the test_model in the last commit
Merge branch 'master' into delete_assigned_block
Merge branch 'master' into enhancement_deuce_context_swift

Conflicts:
	deuce/controllers/blocks.py
	deuce/controllers/fileblocks.py
	deuce/controllers/files.py
	deuce/controllers/vault.py
	deuce/hooks/openstackhook.py
	deuce/tests/__init__.py
Merge branch 'enhancement_deuce_context_swift' into enhancement_deuce_context_swift_full

Conflicts:
	deuce/controllers/blocks.py
	deuce/controllers/fileblocks.py
	deuce/controllers/files.py
	deuce/controllers/vault.py
Deuce Context - OpenStack Swift

JIRA: CBDEUCE-149
- Bug Fix: Several places incorrectly assigned the auth_token in the context
Merge branch 'enhancement_deuce_context_swift_full' into enhancement_test_context_unified

Conflicts:
	deuce/tests/test_swift_storage_driver.py
Status code for deleting a referenced block is 412
Fix cleanup statement
Assert msg
Merge pull request #80 from BenjamenMeyer/enhancement_deuce_context_swift

Deuce Context - OpenStack Swift
Deuce Context - OpenStack Swift - Storage URL

JIRA: CBDEUCE-153
- Update to store the Storage URL for Swift in the Deuce Context OpenStack object under a Swift object
- Fixes Swift mocking so you only have to set a variable to True (default) to use the mock, or False to use the real swift client
Merge branch 'master' into enhancement_deuce_context_swift_full
Merge branch 'enhancement_deuce_context_swift_full' into enhancement_test_context_unified
Merge branch 'enhancement_test_context_unified' into enhancement_deuce_context_swift_storage_url