Merge pull request #19 from glance-/bugfix-s3-upload

Bugfix s3 upload
Merge pull request #20 from hbunke/file_upload

Workaround for missing/wrong URL from pull request #19
Fix S3 uploading once again.

You can't assume that every url returned from ckan api is relative to
the api itself. Now we try to figure out what url is the right one, and
urljoin does that like a charm.

Second, we can't send any ckan-specific headers to S3. That can break S3
upload in more ways then i can imagine.

Fixes #19
Fix S3 uploading once again.

You can't assume that every url returned from ckan api is relative to
the api itself. Now we try to figure out what url is the right one, and
urljoin does that like a charm.

Second, we can't send any ckan-specific headers to S3. That can break S3
upload in more ways then i can imagine.

Fixes #19
Merge branch 'bugfix-s3-upload-again' of https://github.com/glance-/ckanclient into s3

Conflicts:
	ckanclient/__init__.py
cleaning merging errors
Merge pull request #21 from glance-/bugfix-s3-upload-again

Fix S3 uploading once again.
Merge branch 'master' of https://github.com/okfn/ckanclient
[#15,config][s]: support for configuring api key from ckanclientrc - fixes #15.
[#9,cli][m]: crude but functional command line interface -- fixes #9.
changed default API URL from thedatahub.org to datahub.io
Merge pull request #24 from timrdf/master

Pull request: changed default API URL from thedatahub.org to datahub.io
Merge branch 'master' of https://github.com/okfn/ckanclient